New upstream version 0.26.0upstream/0.26.0

86 files changed, 48318 insertions, 47565 deletions

diff --git a/src/AppDirs.c b/src/AppDirs.c
index 7ac7928..6e6c89b 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -130,7 +130,6 @@ GFile* app_dirs_get_temp_dir (void);
 GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname);
 void app_dirs_ensure_writable (GFile* dir);
 GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname);
-GFile* app_dirs_get_resources_dir (void);
 GFile* app_dirs_get_lib_dir (void);
 #define RESOURCES_LIB _LIB
 GFile* app_dirs_get_system_plugins_dir (void);
@@ -182,7 +181,7 @@ void app_dirs_init (const gchar* arg0) {
 	app_dirs_exec_dir = _tmp7_;
 #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (exec_file);
-#line 186 "AppDirs.c"
+#line 185 "AppDirs.c"
 }
 
 
@@ -202,14 +201,14 @@ GFile* app_dirs_get_home_dir (void) {
 	result = _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 206 "AppDirs.c"
+#line 205 "AppDirs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 213 "AppDirs.c"
+#line 212 "AppDirs.c"
 }
 
 
@@ -221,7 +220,7 @@ GFile* app_dirs_get_cache_dir (void) {
 	_tmp1_ = app_dirs_data_dir;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
-#line 225 "AppDirs.c"
+#line 224 "AppDirs.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -240,7 +239,7 @@ GFile* app_dirs_get_cache_dir (void) {
 		_tmp0_ = _tmp5_;
 #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp4_);
-#line 244 "AppDirs.c"
+#line 243 "AppDirs.c"
 	} else {
 		GFile* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -252,13 +251,13 @@ GFile* app_dirs_get_cache_dir (void) {
 		_g_object_unref0 (_tmp0_);
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp0_ = _tmp7_;
-#line 256 "AppDirs.c"
+#line 255 "AppDirs.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 262 "AppDirs.c"
+#line 261 "AppDirs.c"
 }
 
 
@@ -351,7 +350,7 @@ void app_dirs_try_migrate_data (void) {
 	_tmp11_ = g_file_query_exists (_tmp10_, NULL);
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp11_) {
-#line 355 "AppDirs.c"
+#line 354 "AppDirs.c"
 		GFile* _tmp12_ = NULL;
 		GFile* _tmp13_ = NULL;
 		GFile* _tmp14_ = NULL;
@@ -368,15 +367,15 @@ void app_dirs_try_migrate_data (void) {
 		_tmp9_ = !_tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp14_);
-#line 372 "AppDirs.c"
+#line 371 "AppDirs.c"
 	} else {
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = FALSE;
-#line 376 "AppDirs.c"
+#line 375 "AppDirs.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp9_) {
-#line 380 "AppDirs.c"
+#line 379 "AppDirs.c"
 		{
 			GFile* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
@@ -393,12 +392,12 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp18_);
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 397 "AppDirs.c"
-				goto __catch442_g_error;
+#line 396 "AppDirs.c"
+				goto __catch443_g_error;
 			}
 		}
-		goto __finally442;
-		__catch442_g_error:
+		goto __finally443;
+		__catch443_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -407,9 +406,9 @@ void app_dirs_try_migrate_data (void) {
 			_inner_error_ = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 411 "AppDirs.c"
+#line 410 "AppDirs.c"
 		}
-		__finally442:
+		__finally443:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -422,7 +421,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 426 "AppDirs.c"
+#line 425 "AppDirs.c"
 		}
 	}
 	{
@@ -436,12 +435,12 @@ void app_dirs_try_migrate_data (void) {
 		g_file_move (_tmp19_, _tmp20_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_);
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 440 "AppDirs.c"
-			goto __catch443_g_error;
+#line 439 "AppDirs.c"
+			goto __catch444_g_error;
 		}
 	}
-	goto __finally443;
-	__catch443_g_error:
+	goto __finally444;
+	__catch444_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -450,9 +449,9 @@ void app_dirs_try_migrate_data (void) {
 		_inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 454 "AppDirs.c"
+#line 453 "AppDirs.c"
 	}
-	__finally443:
+	__finally444:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -465,7 +464,7 @@ void app_dirs_try_migrate_data (void) {
 		g_clear_error (&_inner_error_);
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 469 "AppDirs.c"
+#line 468 "AppDirs.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp21_ = app_dirs_get_data_dir ();
@@ -491,7 +490,7 @@ void app_dirs_try_migrate_data (void) {
 	if (_tmp27_) {
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp25_ = TRUE;
-#line 495 "AppDirs.c"
+#line 494 "AppDirs.c"
 	} else {
 		GFile* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
@@ -501,7 +500,7 @@ void app_dirs_try_migrate_data (void) {
 		_tmp29_ = g_file_query_exists (_tmp28_, NULL);
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp25_ = !_tmp29_;
-#line 505 "AppDirs.c"
+#line 504 "AppDirs.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp25_) {
@@ -513,7 +512,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_object_unref0 (user_plugin_dir);
 #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 517 "AppDirs.c"
+#line 516 "AppDirs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp30_ = app_dirs_get_cache_dir ();
@@ -529,7 +528,7 @@ void app_dirs_try_migrate_data (void) {
 	_tmp33_ = g_file_query_exists (_tmp32_, NULL);
 #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp33_) {
-#line 533 "AppDirs.c"
+#line 532 "AppDirs.c"
 		{
 			GFile* _tmp34_ = NULL;
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -538,12 +537,12 @@ void app_dirs_try_migrate_data (void) {
 			g_file_make_directory_with_parents (_tmp34_, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 542 "AppDirs.c"
-				goto __catch444_g_error;
+#line 541 "AppDirs.c"
+				goto __catch445_g_error;
 			}
 		}
-		goto __finally444;
-		__catch444_g_error:
+		goto __finally445;
+		__catch445_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp35_ = NULL;
@@ -582,9 +581,9 @@ void app_dirs_try_migrate_data (void) {
 			_g_free0 (_tmp38_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 586 "AppDirs.c"
+#line 585 "AppDirs.c"
 		}
-		__finally444:
+		__finally445:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -601,7 +600,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 605 "AppDirs.c"
+#line 604 "AppDirs.c"
 		}
 	}
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -648,7 +647,7 @@ void app_dirs_try_migrate_data (void) {
 	_g_object_unref0 (_tmp55_);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp57_) {
-#line 652 "AppDirs.c"
+#line 651 "AppDirs.c"
 		{
 			GFile* _tmp58_ = NULL;
 			GFile* _tmp59_ = NULL;
@@ -665,12 +664,12 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp60_);
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 669 "AppDirs.c"
-				goto __catch445_g_error;
+#line 668 "AppDirs.c"
+				goto __catch446_g_error;
 			}
 		}
-		goto __finally445;
-		__catch445_g_error:
+		goto __finally446;
+		__catch446_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp61_ = NULL;
@@ -717,9 +716,9 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp64_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 721 "AppDirs.c"
+#line 720 "AppDirs.c"
 		}
-		__finally445:
+		__finally446:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -736,7 +735,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 740 "AppDirs.c"
+#line 739 "AppDirs.c"
 		}
 	}
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -779,7 +778,7 @@ void app_dirs_try_migrate_data (void) {
 	_g_object_unref0 (old_dir);
 #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (user_plugin_dir);
-#line 783 "AppDirs.c"
+#line 782 "AppDirs.c"
 }
 
 
@@ -819,7 +818,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_tmp6_ = g_path_is_absolute (_tmp5_);
 #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp6_) {
-#line 823 "AppDirs.c"
+#line 822 "AppDirs.c"
 		GFile* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -838,7 +837,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		app_dirs_data_dir = _tmp10_;
 #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 842 "AppDirs.c"
+#line 841 "AppDirs.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
@@ -850,7 +849,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		_g_object_unref0 (app_dirs_data_dir);
 #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_data_dir = _tmp12_;
-#line 854 "AppDirs.c"
+#line 853 "AppDirs.c"
 	}
 #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp13_ = app_dirs_data_dir;
@@ -864,7 +863,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_g_free0 (_tmp15_);
 #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_free0 (path);
-#line 868 "AppDirs.c"
+#line 867 "AppDirs.c"
 }
 
 
@@ -876,7 +875,7 @@ void app_dirs_verify_data_dir (void) {
 	_tmp0_ = app_dirs_get_data_dir ();
 #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	data_dir = _tmp0_;
-#line 880 "AppDirs.c"
+#line 879 "AppDirs.c"
 	{
 		GFile* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
@@ -886,7 +885,7 @@ void app_dirs_verify_data_dir (void) {
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 890 "AppDirs.c"
+#line 889 "AppDirs.c"
 			GFile* _tmp3_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = data_dir;
@@ -894,13 +893,13 @@ void app_dirs_verify_data_dir (void) {
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "AppDirs.c"
-				goto __catch446_g_error;
+#line 897 "AppDirs.c"
+				goto __catch447_g_error;
 			}
 		}
 	}
-	goto __finally446;
-	__catch446_g_error:
+	goto __finally447;
+	__catch447_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -939,9 +938,9 @@ void app_dirs_verify_data_dir (void) {
 		_g_free0 (_tmp7_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 943 "AppDirs.c"
+#line 942 "AppDirs.c"
 	}
-	__finally446:
+	__finally447:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -952,11 +951,11 @@ void app_dirs_verify_data_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 956 "AppDirs.c"
+#line 955 "AppDirs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (data_dir);
-#line 960 "AppDirs.c"
+#line 959 "AppDirs.c"
 }
 
 
@@ -968,7 +967,7 @@ void app_dirs_verify_cache_dir (void) {
 	_tmp0_ = app_dirs_get_cache_dir ();
 #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	cache_dir = _tmp0_;
-#line 972 "AppDirs.c"
+#line 971 "AppDirs.c"
 	{
 		GFile* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
@@ -978,7 +977,7 @@ void app_dirs_verify_cache_dir (void) {
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 982 "AppDirs.c"
+#line 981 "AppDirs.c"
 			GFile* _tmp3_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = cache_dir;
@@ -986,13 +985,13 @@ void app_dirs_verify_cache_dir (void) {
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 990 "AppDirs.c"
-				goto __catch447_g_error;
+#line 989 "AppDirs.c"
+				goto __catch448_g_error;
 			}
 		}
 	}
-	goto __finally447;
-	__catch447_g_error:
+	goto __finally448;
+	__catch448_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -1031,9 +1030,9 @@ void app_dirs_verify_cache_dir (void) {
 		_g_free0 (_tmp7_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1035 "AppDirs.c"
+#line 1034 "AppDirs.c"
 	}
-	__finally447:
+	__finally448:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1044,11 +1043,11 @@ void app_dirs_verify_cache_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 1048 "AppDirs.c"
+#line 1047 "AppDirs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (cache_dir);
-#line 1052 "AppDirs.c"
+#line 1051 "AppDirs.c"
 }
 
 
@@ -1065,7 +1064,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 	_tmp0_ = app_dirs_libexec_dir;
 #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1069 "AppDirs.c"
+#line 1068 "AppDirs.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -1079,7 +1078,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 		_g_object_unref0 (_tmp2_);
 #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (_tmp3_) {
-#line 1083 "AppDirs.c"
+#line 1082 "AppDirs.c"
 			GFile* _tmp4_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = app_dirs_get_exec_dir ();
@@ -1087,7 +1086,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp4_;
-#line 1091 "AppDirs.c"
+#line 1090 "AppDirs.c"
 		} else {
 			GFile* _tmp5_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1096,7 +1095,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp5_;
-#line 1100 "AppDirs.c"
+#line 1099 "AppDirs.c"
 		}
 	}
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1107,7 +1106,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 	result = _tmp7_;
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1111 "AppDirs.c"
+#line 1110 "AppDirs.c"
 }
 
 
@@ -1123,7 +1122,7 @@ GFile* app_dirs_get_install_dir (void) {
 	result = _tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1127 "AppDirs.c"
+#line 1126 "AppDirs.c"
 }
 
 
@@ -1135,7 +1134,7 @@ GFile* app_dirs_get_data_dir (void) {
 	_tmp1_ = app_dirs_data_dir;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
-#line 1139 "AppDirs.c"
+#line 1138 "AppDirs.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -1154,7 +1153,7 @@ GFile* app_dirs_get_data_dir (void) {
 		_tmp0_ = _tmp5_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1158 "AppDirs.c"
+#line 1157 "AppDirs.c"
 	} else {
 		GFile* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1166,13 +1165,13 @@ GFile* app_dirs_get_data_dir (void) {
 		_g_object_unref0 (_tmp0_);
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp0_ = _tmp7_;
-#line 1170 "AppDirs.c"
+#line 1169 "AppDirs.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1176 "AppDirs.c"
+#line 1175 "AppDirs.c"
 }
 
 
@@ -1212,7 +1211,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp5_) {
-#line 1216 "AppDirs.c"
+#line 1215 "AppDirs.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
@@ -1233,7 +1232,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_tmp9_ = g_path_is_absolute (_tmp8_);
 #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp9_) {
-#line 1237 "AppDirs.c"
+#line 1236 "AppDirs.c"
 			GFile* _tmp10_ = NULL;
 			GFile* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
@@ -1257,7 +1256,7 @@ GFile* app_dirs_get_import_dir (void) {
 			_g_free0 (path);
 #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 1261 "AppDirs.c"
+#line 1260 "AppDirs.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp15_ = path;
@@ -1269,7 +1268,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1273 "AppDirs.c"
+#line 1272 "AppDirs.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
@@ -1285,7 +1284,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp20_ = is_string_empty (_tmp19_);
 #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp20_) {
-#line 1289 "AppDirs.c"
+#line 1288 "AppDirs.c"
 		const gchar* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1298,7 +1297,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1302 "AppDirs.c"
+#line 1301 "AppDirs.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp23_ = app_dirs_get_home_dir ();
@@ -1318,7 +1317,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_g_free0 (path);
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1322 "AppDirs.c"
+#line 1321 "AppDirs.c"
 }
 
 
@@ -1367,7 +1366,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_) {
-#line 1371 "AppDirs.c"
+#line 1370 "AppDirs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -1383,7 +1382,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 		pattern = _tmp8_;
 #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1387 "AppDirs.c"
+#line 1386 "AppDirs.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp9_ = pattern;
@@ -1391,7 +1390,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp10_ = is_string_empty (_tmp9_);
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp10_) {
-#line 1395 "AppDirs.c"
+#line 1394 "AppDirs.c"
 		gchar* _tmp11_ = NULL;
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
@@ -1399,7 +1398,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 		_g_free0 (pattern);
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		pattern = _tmp11_;
-#line 1403 "AppDirs.c"
+#line 1402 "AppDirs.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp12_ = tm;
@@ -1451,7 +1450,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_g_free0 (pattern);
 #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1455 "AppDirs.c"
+#line 1454 "AppDirs.c"
 }
 
 
@@ -1479,7 +1478,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	if (_tmp4_) {
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = TRUE;
-#line 1483 "AppDirs.c"
+#line 1482 "AppDirs.c"
 	} else {
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
@@ -1492,7 +1491,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 		_tmp7_ = g_file_equal (_tmp5_, _tmp6_);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 1496 "AppDirs.c"
+#line 1495 "AppDirs.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -1500,7 +1499,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	_g_object_unref0 (import_dir);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1504 "AppDirs.c"
+#line 1503 "AppDirs.c"
 }
 
 
@@ -1520,7 +1519,7 @@ void app_dirs_set_import_dir (const gchar* path) {
 	configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
 #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1524 "AppDirs.c"
+#line 1523 "AppDirs.c"
 }
 
 
@@ -1536,7 +1535,7 @@ GFile* app_dirs_get_exec_dir (void) {
 	result = _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1540 "AppDirs.c"
+#line 1539 "AppDirs.c"
 }
 
 
@@ -1550,7 +1549,7 @@ GFile* app_dirs_get_temp_dir (void) {
 	_tmp0_ = app_dirs_tmp_dir;
 #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1554 "AppDirs.c"
+#line 1553 "AppDirs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1572,7 +1571,7 @@ GFile* app_dirs_get_temp_dir (void) {
 		app_dirs_tmp_dir = _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_free0 (_tmp4_);
-#line 1576 "AppDirs.c"
+#line 1575 "AppDirs.c"
 		{
 			GFile* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
@@ -1582,7 +1581,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_tmp7_ = g_file_query_exists (_tmp6_, NULL);
 #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp7_) {
-#line 1586 "AppDirs.c"
+#line 1585 "AppDirs.c"
 				GFile* _tmp8_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_tmp8_ = app_dirs_tmp_dir;
@@ -1590,13 +1589,13 @@ GFile* app_dirs_get_temp_dir (void) {
 				g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1594 "AppDirs.c"
-					goto __catch448_g_error;
+#line 1593 "AppDirs.c"
+					goto __catch449_g_error;
 				}
 			}
 		}
-		goto __finally448;
-		__catch448_g_error:
+		goto __finally449;
+		__catch449_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -1635,9 +1634,9 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_free0 (_tmp12_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1639 "AppDirs.c"
+#line 1638 "AppDirs.c"
 		}
-		__finally448:
+		__finally449:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1646,7 +1645,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			g_clear_error (&_inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return NULL;
-#line 1650 "AppDirs.c"
+#line 1649 "AppDirs.c"
 		}
 	}
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1657,7 +1656,7 @@ GFile* app_dirs_get_temp_dir (void) {
 	result = _tmp18_;
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1661 "AppDirs.c"
+#line 1660 "AppDirs.c"
 }
 
 
@@ -1691,7 +1690,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 	_tmp5_ = subname;
 #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_ != NULL) {
-#line 1695 "AppDirs.c"
+#line 1694 "AppDirs.c"
 		GFile* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -1705,7 +1704,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp8_;
-#line 1709 "AppDirs.c"
+#line 1708 "AppDirs.c"
 	}
 	{
 		GFile* _tmp9_ = NULL;
@@ -1716,7 +1715,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_tmp10_ = g_file_query_exists (_tmp9_, NULL);
 #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp10_) {
-#line 1720 "AppDirs.c"
+#line 1719 "AppDirs.c"
 			GFile* _tmp11_ = NULL;
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp11_ = subdir;
@@ -1724,13 +1723,13 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 			g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1728 "AppDirs.c"
-				goto __catch449_g_error;
+#line 1727 "AppDirs.c"
+				goto __catch450_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_g_error:
+	goto __finally450;
+	__catch450_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -1769,9 +1768,9 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_free0 (_tmp15_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1773 "AppDirs.c"
+#line 1772 "AppDirs.c"
 	}
-	__finally449:
+	__finally450:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1782,13 +1781,13 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 1786 "AppDirs.c"
+#line 1785 "AppDirs.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = subdir;
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1792 "AppDirs.c"
+#line 1791 "AppDirs.c"
 }
 
 
@@ -1804,7 +1803,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 	_tmp1_ = g_file_query_exists (_tmp0_, NULL);
 #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_) {
-#line 1808 "AppDirs.c"
+#line 1807 "AppDirs.c"
 		{
 			GFileInfo* info = NULL;
 			GFile* _tmp2_ = NULL;
@@ -1824,8 +1823,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			info = _tmp3_;
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1828 "AppDirs.c"
-				goto __catch450_g_error;
+#line 1827 "AppDirs.c"
+				goto __catch451_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1845,12 +1844,12 @@ void app_dirs_ensure_writable (GFile* dir) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
-#line 1849 "AppDirs.c"
-				goto __catch450_g_error;
+#line 1848 "AppDirs.c"
+				goto __catch451_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
-#line 1854 "AppDirs.c"
+#line 1853 "AppDirs.c"
 				const gchar* _tmp10_ = NULL;
 				GFile* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
@@ -1875,14 +1874,14 @@ void app_dirs_ensure_writable (GFile* dir) {
 				_g_free0 (_tmp15_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_free0 (_tmp13_);
-#line 1879 "AppDirs.c"
+#line 1878 "AppDirs.c"
 			}
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_object_unref0 (info);
-#line 1883 "AppDirs.c"
+#line 1882 "AppDirs.c"
 		}
-		goto __finally450;
-		__catch450_g_error:
+		goto __finally451;
+		__catch451_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp16_ = NULL;
@@ -1921,9 +1920,9 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_free0 (_tmp19_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1925 "AppDirs.c"
+#line 1924 "AppDirs.c"
 		}
-		__finally450:
+		__finally451:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1932,7 +1931,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			g_clear_error (&_inner_error_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 1936 "AppDirs.c"
+#line 1935 "AppDirs.c"
 		}
 	}
 }
@@ -1974,7 +1973,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	_tmp6_ = subname;
 #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp6_ != NULL) {
-#line 1978 "AppDirs.c"
+#line 1977 "AppDirs.c"
 		GFile* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
@@ -1988,7 +1987,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp9_;
-#line 1992 "AppDirs.c"
+#line 1991 "AppDirs.c"
 	}
 	{
 		GFile* _tmp10_ = NULL;
@@ -1999,7 +1998,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_tmp11_ = g_file_query_exists (_tmp10_, NULL);
 #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp11_) {
-#line 2003 "AppDirs.c"
+#line 2002 "AppDirs.c"
 			GFile* _tmp12_ = NULL;
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp12_ = subdir;
@@ -2007,13 +2006,13 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 			g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2011 "AppDirs.c"
-				goto __catch451_g_error;
+#line 2010 "AppDirs.c"
+				goto __catch452_g_error;
 			}
 		}
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally452;
+	__catch452_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -2052,9 +2051,9 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_free0 (_tmp16_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 2056 "AppDirs.c"
+#line 2055 "AppDirs.c"
 	}
-	__finally451:
+	__finally452:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2065,7 +2064,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 2069 "AppDirs.c"
+#line 2068 "AppDirs.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp21_ = subdir;
@@ -2075,11 +2074,11 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	result = subdir;
 #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2079 "AppDirs.c"
+#line 2078 "AppDirs.c"
 }
 
 
-GFile* app_dirs_get_resources_dir (void) {
+GFile* app_dirs_get_lib_dir (void) {
 	GFile* result = NULL;
 	GFile* install_dir = NULL;
 	GFile* _tmp0_ = NULL;
@@ -2093,7 +2092,7 @@ GFile* app_dirs_get_resources_dir (void) {
 	_tmp2_ = install_dir;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp2_ != NULL) {
-#line 2097 "AppDirs.c"
+#line 2096 "AppDirs.c"
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2101,7 +2100,7 @@ GFile* app_dirs_get_resources_dir (void) {
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp3_ = install_dir;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = g_file_get_child (_tmp3_, "share");
+		_tmp4_ = g_file_get_child (_tmp3_, RESOURCES_LIB);
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp5_ = _tmp4_;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2112,7 +2111,7 @@ GFile* app_dirs_get_resources_dir (void) {
 		_tmp1_ = _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2116 "AppDirs.c"
+#line 2115 "AppDirs.c"
 	} else {
 		GFile* _tmp7_ = NULL;
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2121,7 +2120,7 @@ GFile* app_dirs_get_resources_dir (void) {
 		_g_object_unref0 (_tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 2125 "AppDirs.c"
+#line 2124 "AppDirs.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -2129,61 +2128,7 @@ GFile* app_dirs_get_resources_dir (void) {
 	_g_object_unref0 (install_dir);
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2133 "AppDirs.c"
-}
-
-
-GFile* app_dirs_get_lib_dir (void) {
-	GFile* result = NULL;
-	GFile* install_dir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp0_ = app_dirs_get_install_dir ();
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	install_dir = _tmp0_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp2_ = install_dir;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	if (_tmp2_ != NULL) {
-#line 2151 "AppDirs.c"
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp3_ = install_dir;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = g_file_get_child (_tmp3_, RESOURCES_LIB);
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp5_ = _tmp4_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp6_ = g_file_get_child (_tmp5_, "shotwell");
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp6_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp5_);
-#line 2170 "AppDirs.c"
-	} else {
-		GFile* _tmp7_ = NULL;
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp7_ = app_dirs_get_exec_dir ();
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp7_;
-#line 2179 "AppDirs.c"
-	}
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	result = _tmp1_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_g_object_unref0 (install_dir);
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	return result;
-#line 2187 "AppDirs.c"
+#line 2132 "AppDirs.c"
 }
 
 
@@ -2193,21 +2138,21 @@ GFile* app_dirs_get_system_plugins_dir (void) {
 	GFile* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_lib_dir ();
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2211 "AppDirs.c"
+#line 2156 "AppDirs.c"
 }
 
 
@@ -2217,54 +2162,54 @@ GFile* app_dirs_get_user_plugins_dir (void) {
 	GFile* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_data_dir ();
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2235 "AppDirs.c"
+#line 2180 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_log_file (void) {
 	GFile* result = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ != NULL) {
-#line 2246 "AppDirs.c"
+#line 2191 "AppDirs.c"
 		const gchar* _tmp1_ = NULL;
-#line 285 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 285 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (g_strcmp0 (_tmp1_, ":console:") == 0) {
-#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = NULL;
-#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2256 "AppDirs.c"
+#line 2201 "AppDirs.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp2_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = _tmp3_;
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2268 "AppDirs.c"
+#line 2213 "AppDirs.c"
 		}
 	} else {
 		const gchar* _tmp4_ = NULL;
@@ -2274,38 +2219,38 @@ GFile* app_dirs_get_log_file (void) {
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp4_ = g_get_user_cache_dir ();
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = _tmp5_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = g_file_get_child (_tmp6_, "shotwell");
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = _tmp7_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = g_file_get_child (_tmp8_, "shotwell.log");
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = _tmp9_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		result = _tmp10_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 2300 "AppDirs.c"
+#line 2245 "AppDirs.c"
 	}
 }
 
 
 GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* result = NULL;
-#line 297 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-video-thumbnailer";
-#line 2309 "AppDirs.c"
+#line 2254 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
@@ -2315,69 +2260,69 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "thumbnailer");
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2343 "AppDirs.c"
+#line 2288 "AppDirs.c"
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2367 "AppDirs.c"
+#line 2312 "AppDirs.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2373 "AppDirs.c"
+#line 2318 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* result = NULL;
-#line 307 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-settings-migrator";
-#line 2381 "AppDirs.c"
+#line 2326 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
@@ -2387,61 +2332,61 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "settings-migrator");
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2415 "AppDirs.c"
+#line 2360 "AppDirs.c"
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2439 "AppDirs.c"
+#line 2384 "AppDirs.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2445 "AppDirs.c"
+#line 2390 "AppDirs.c"
 }
 
 
@@ -2451,21 +2396,21 @@ AppDirs* app_dirs_construct (GType object_type) {
 	self = (AppDirs*) g_type_create_instance (object_type);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return self;
-#line 2455 "AppDirs.c"
+#line 2400 "AppDirs.c"
 }
 
 
 AppDirs* app_dirs_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return app_dirs_construct (TYPE_APP_DIRS);
-#line 2462 "AppDirs.c"
+#line 2407 "AppDirs.c"
 }
 
 
 static void value_app_dirs_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	value->data[0].v_pointer = NULL;
-#line 2469 "AppDirs.c"
+#line 2414 "AppDirs.c"
 }
 
 
@@ -2474,7 +2419,7 @@ static void value_app_dirs_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (value->data[0].v_pointer);
-#line 2478 "AppDirs.c"
+#line 2423 "AppDirs.c"
 	}
 }
 
@@ -2484,11 +2429,11 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer);
-#line 2488 "AppDirs.c"
+#line 2433 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2492 "AppDirs.c"
+#line 2437 "AppDirs.c"
 	}
 }
 
@@ -2496,37 +2441,37 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_app_dirs_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2500 "AppDirs.c"
+#line 2445 "AppDirs.c"
 }
 
 
 static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (collect_values[0].v_pointer) {
-#line 2507 "AppDirs.c"
+#line 2452 "AppDirs.c"
 		AppDirs* object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2514 "AppDirs.c"
+#line 2459 "AppDirs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2518 "AppDirs.c"
+#line 2463 "AppDirs.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = app_dirs_ref (object);
-#line 2522 "AppDirs.c"
+#line 2467 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2526 "AppDirs.c"
+#line 2471 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2530 "AppDirs.c"
+#line 2475 "AppDirs.c"
 }
 
 
@@ -2537,25 +2482,25 @@ static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2541 "AppDirs.c"
+#line 2486 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = NULL;
-#line 2547 "AppDirs.c"
+#line 2492 "AppDirs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2551 "AppDirs.c"
+#line 2496 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = app_dirs_ref (value->data[0].v_pointer);
-#line 2555 "AppDirs.c"
+#line 2500 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2559 "AppDirs.c"
+#line 2504 "AppDirs.c"
 }
 
 
@@ -2569,7 +2514,7 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return G_PARAM_SPEC (spec);
-#line 2573 "AppDirs.c"
+#line 2518 "AppDirs.c"
 }
 
 
@@ -2578,7 +2523,7 @@ gpointer value_get_app_dirs (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2582 "AppDirs.c"
+#line 2527 "AppDirs.c"
 }
 
 
@@ -2598,17 +2543,17 @@ void value_set_app_dirs (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_ref (value->data[0].v_pointer);
-#line 2602 "AppDirs.c"
+#line 2547 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2606 "AppDirs.c"
+#line 2551 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2612 "AppDirs.c"
+#line 2557 "AppDirs.c"
 	}
 }
 
@@ -2627,17 +2572,17 @@ void value_take_app_dirs (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2631 "AppDirs.c"
+#line 2576 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2635 "AppDirs.c"
+#line 2580 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2641 "AppDirs.c"
+#line 2586 "AppDirs.c"
 	}
 }
 
@@ -2647,14 +2592,14 @@ static void app_dirs_class_init (AppDirsClass * klass) {
 	app_dirs_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	((AppDirsClass *) klass)->finalize = app_dirs_finalize;
-#line 2651 "AppDirs.c"
+#line 2596 "AppDirs.c"
 }
 
 
 static void app_dirs_instance_init (AppDirs * self) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	self->ref_count = 1;
-#line 2658 "AppDirs.c"
+#line 2603 "AppDirs.c"
 }
 
 
@@ -2664,7 +2609,7 @@ static void app_dirs_finalize (AppDirs* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_DIRS, AppDirs);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_signal_handlers_destroy (self);
-#line 2668 "AppDirs.c"
+#line 2613 "AppDirs.c"
 }
 
 
@@ -2689,7 +2634,7 @@ gpointer app_dirs_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return instance;
-#line 2693 "AppDirs.c"
+#line 2638 "AppDirs.c"
 }
 
 
@@ -2702,7 +2647,7 @@ void app_dirs_unref (gpointer instance) {
 		APP_DIRS_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2706 "AppDirs.c"
+#line 2651 "AppDirs.c"
 	}
 }
 
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 94be26b..0c69270 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -258,13 +258,6 @@ class AppDirs {
         return subdir;
     }
     
-    public static File get_resources_dir() {
-        File? install_dir = get_install_dir();
-        
-        return (install_dir != null) ? install_dir.get_child("share").get_child("shotwell")
-            : get_exec_dir();
-    }
-    
     public static File get_lib_dir() {
         File? install_dir = get_install_dir();
         
diff --git a/src/AppWindow.c b/src/AppWindow.c
index b36bbbe..9eab2b4 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -485,7 +485,7 @@ static void app_window_real_on_fullscreen (AppWindow* self);
 gboolean app_window_has_instance (void);
 FullscreenWindow* app_window_get_fullscreen (void);
 GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
-GFile* app_dirs_get_resources_dir (void);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape);
 gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape);
@@ -525,7 +525,7 @@ static gchar* app_window_real_get_app_role (AppWindow* self);
 "c., \n" \
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
-#define RESOURCES_ICON_ABOUT_LOGO "shotwell-street.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.jpg"
 void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
 void app_window_show_uri (AppWindow* self, const gchar* url, GError** error);
 #define RESOURCES_BUG_DB_URL "https://wiki.gnome.org/Apps/Shotwell/ReportingABug"
@@ -2513,7 +2513,7 @@ AppWindow* app_window_construct (GType object_type) {
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2488 "AppWindow.c"
-			goto __catch225_g_error;
+			goto __catch226_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = gdk_screen_get_default ();
@@ -2521,8 +2521,8 @@ AppWindow* app_window_construct (GType object_type) {
 		gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 #line 2495 "AppWindow.c"
 	}
-	goto __finally225;
-	__catch225_g_error:
+	goto __finally226;
+	__catch226_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -2541,7 +2541,7 @@ AppWindow* app_window_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 2515 "AppWindow.c"
 	}
-	__finally225:
+	__finally226:
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2629,7 +2629,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	GtkBuilder* result = NULL;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_ = NULL;
-	void* _tmp12_ = NULL;
+	void* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (glade_filename != NULL, NULL);
@@ -2639,70 +2639,46 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	builder = _tmp0_;
 #line 2613 "AppWindow.c"
 	{
-		GFile* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp1_ = app_dirs_get_resources_dir ();
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = _tmp1_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = g_file_get_child (_tmp2_, "ui");
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = _tmp3_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp5_ = glade_filename;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp6_ = g_file_get_child (_tmp4_, _tmp5_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = _tmp6_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp8_ = g_file_get_path (_tmp7_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp9_ = _tmp8_;
+		const gchar* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_builder_add_from_file (builder, _tmp9_, &_inner_error_);
+		_tmp1_ = glade_filename;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp9_);
+		_tmp2_ = resources_get_ui (_tmp1_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp7_);
+		_tmp3_ = _tmp2_;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp4_);
+		gtk_builder_add_from_resource (builder, _tmp3_, &_inner_error_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_free0 (_tmp3_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2654 "AppWindow.c"
-			goto __catch226_g_error;
+#line 2630 "AppWindow.c"
+			goto __catch227_g_error;
 		}
 	}
-	goto __finally226;
-	__catch226_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp10_ = _error_;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp11_ = _tmp10_->message;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_warning ("AppWindow.vala:483: Unable to create Gtk.Builder: %s\n", _tmp11_);
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp4_ = _error_;
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp5_ = _tmp4_->message;
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp5_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 2676 "AppWindow.c"
+#line 2652 "AppWindow.c"
 	}
-	__finally226:
+	__finally227:
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2713,34 +2689,34 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_clear_error (&_inner_error_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2689 "AppWindow.c"
+#line 2665 "AppWindow.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = user;
-#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_builder_connect_signals (builder, _tmp12_);
-#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = user;
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_builder_connect_signals (builder, _tmp6_);
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = builder;
-#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2699 "AppWindow.c"
+#line 2675 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	const gchar* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/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"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = message;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2716 "AppWindow.c"
+#line 2692 "AppWindow.c"
 }
 
 
@@ -2760,83 +2736,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	gboolean _tmp14_ = FALSE;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2746 "AppWindow.c"
+#line 2722 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2757 "AppWindow.c"
+#line 2733 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2766 "AppWindow.c"
+#line 2742 "AppWindow.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = should_escape;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/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 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp9_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp11_;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = title;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = message;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = should_escape;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/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"
+#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2812 "AppWindow.c"
+#line 2788 "AppWindow.c"
 }
 
 
@@ -2859,93 +2835,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	const gchar* _tmp16_ = NULL;
 	gboolean response = FALSE;
 	gint _tmp17_ = 0;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2847 "AppWindow.c"
+#line 2823 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2858 "AppWindow.c"
+#line 2834 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2867 "AppWindow.c"
+#line 2843 "AppWindow.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/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 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = message;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp14_);
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = negative;
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = affirmative;
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/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 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = response;
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2921 "AppWindow.c"
+#line 2897 "AppWindow.c"
 }
 
 
@@ -2969,95 +2945,95 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	gchar* _tmp17_ = NULL;
 	gint response = 0;
 	gint _tmp18_ = 0;
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2957 "AppWindow.c"
+#line 2933 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2968 "AppWindow.c"
+#line 2944 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2977 "AppWindow.c"
+#line 2953 "AppWindow.c"
 	}
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/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 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = negative;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _ ("_Cancel");
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = title;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = message;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = _tmp16_;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp17_);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp17_);
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 540 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3033 "AppWindow.c"
+#line 3009 "AppWindow.c"
 }
 
 
@@ -3081,103 +3057,103 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	GtkMessageDialog* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3067 "AppWindow.c"
+#line 3043 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3078 "AppWindow.c"
+#line 3054 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3087 "AppWindow.c"
+#line 3063 "AppWindow.c"
 	}
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/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 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = dialog;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = message;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = dialog;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3111 "AppWindow.c"
+#line 3087 "AppWindow.c"
 		const gchar* _tmp12_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3117 "AppWindow.c"
+#line 3093 "AppWindow.c"
 	} else {
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3121 "AppWindow.c"
+#line 3097 "AppWindow.c"
 	}
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = dialog;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _ ("_Cancel");
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = dialog;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = dialog;
-#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3153 "AppWindow.c"
+#line 3129 "AppWindow.c"
 }
 
 
@@ -3200,101 +3176,101 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	GtkMessageDialog* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	GtkMessageDialog* _tmp18_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3190 "AppWindow.c"
+#line 3166 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3201 "AppWindow.c"
+#line 3177 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3210 "AppWindow.c"
+#line 3186 "AppWindow.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/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 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = title;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3224 "AppWindow.c"
+#line 3200 "AppWindow.c"
 		const gchar* _tmp9_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3230 "AppWindow.c"
+#line 3206 "AppWindow.c"
 	} else {
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3234 "AppWindow.c"
+#line 3210 "AppWindow.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = dialog;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = negative;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = affirmative;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = _ ("_Cancel");
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = dialog;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = dialog;
-#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3270 "AppWindow.c"
+#line 3246 "AppWindow.c"
 }
 
 
@@ -3304,24 +3280,24 @@ void app_window_database_error (GError* err) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
 "not continue.\n" \
 "\n" \
 "%s");
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = err;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_->message;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_panic (_tmp4_);
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp4_);
-#line 3294 "AppWindow.c"
+#line 3270 "AppWindow.c"
 }
 
 
@@ -3330,54 +3306,58 @@ void app_window_panic (const gchar* msg) {
 	const gchar* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
 	Application* _tmp3_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (msg != NULL);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 584 "/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 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message (_tmp1_, NULL);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_instance ();
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_panic (_tmp3_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3321 "AppWindow.c"
+#line 3297 "AppWindow.c"
 }
 
 
 static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/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 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3330 "AppWindow.c"
+#line 3306 "AppWindow.c"
 }
 
 
 gchar* app_window_get_app_role (AppWindow* self) {
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3339 "AppWindow.c"
+#line 3315 "AppWindow.c"
 }
 
 
 void app_window_on_about (AppWindow* self) {
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	static const gchar* artists[] = {"Aachen logo under public domain license https://www.flickr.com/photos/" \
+"30784528@N04/10860988196/", NULL};
+#line 3322 "AppWindow.c"
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_app_role (self);
@@ -3392,34 +3372,34 @@ void app_window_on_about (AppWindow* self) {
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _ ("translator-credits");
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", 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);
+	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", RESOURCES_APP_VERSION " \u2013 \"Aachen\"", "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "artists", artists, "translator-credits", _tmp5_, NULL, NULL);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3370 "AppWindow.c"
+#line 3349 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3378 "AppWindow.c"
+#line 3357 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3387 "AppWindow.c"
-			goto __catch227_g_error;
+#line 3366 "AppWindow.c"
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3427,58 +3407,58 @@ static void app_window_on_help_contents (AppWindow* self) {
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _ ("Unable to display help: %s");
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = err;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_->message;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp5_, NULL);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3420 "AppWindow.c"
+#line 3399 "AppWindow.c"
 	}
-	__finally227:
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally228:
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/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 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3431 "AppWindow.c"
+#line 3410 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3440 "AppWindow.c"
+#line 3419 "AppWindow.c"
 	{
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3446 "AppWindow.c"
-			goto __catch228_g_error;
+#line 3425 "AppWindow.c"
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3486,58 +3466,58 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3479 "AppWindow.c"
+#line 3458 "AppWindow.c"
 	}
-	__finally228:
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally229:
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/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 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3490 "AppWindow.c"
+#line 3469 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3499 "AppWindow.c"
+#line 3478 "AppWindow.c"
 	{
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3505 "AppWindow.c"
-			goto __catch229_g_error;
+#line 3484 "AppWindow.c"
+			goto __catch230_g_error;
 		}
 	}
-	goto __finally229;
-	__catch229_g_error:
+	goto __finally230;
+	__catch230_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3545,38 +3525,38 @@ static void app_window_on_help_faq (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3538 "AppWindow.c"
+#line 3517 "AppWindow.c"
 	}
-	__finally229:
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally230:
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/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 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3549 "AppWindow.c"
+#line 3528 "AppWindow.c"
 	}
 }
 
@@ -3584,24 +3564,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 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3565 "AppWindow.c"
+#line 3544 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3574 "AppWindow.c"
+#line 3553 "AppWindow.c"
 }
 
 
@@ -3624,71 +3604,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_ = NULL;
 	MediaSource* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#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"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_) {
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_) {
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3619 "AppWindow.c"
+#line 3598 "AppWindow.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3641 "AppWindow.c"
+#line 3620 "AppWindow.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp15_ == NULL) {
 #line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp15_ == NULL) {
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3661 "AppWindow.c"
+#line 3640 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -3696,79 +3676,79 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3687 "AppWindow.c"
-			goto __catch230_g_error;
+#line 3666 "AppWindow.c"
+			goto __catch231_g_error;
 		}
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally231;
+	__catch231_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3714 "AppWindow.c"
+#line 3693 "AppWindow.c"
 	}
-	__finally230:
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally231:
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/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 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3727 "AppWindow.c"
+#line 3706 "AppWindow.c"
 	}
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3731 "AppWindow.c"
+#line 3710 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#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"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3741 "AppWindow.c"
+#line 3720 "AppWindow.c"
 }
 
 
@@ -3781,7 +3761,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3754 "AppWindow.c"
+#line 3733 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3812,8 +3792,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3785 "AppWindow.c"
-				goto __catch231_g_regex_error;
+#line 3764 "AppWindow.c"
+				goto __catch232_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -3821,7 +3801,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3794 "AppWindow.c"
+#line 3773 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3837,8 +3817,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3810 "AppWindow.c"
-				goto __catch231_g_regex_error;
+#line 3789 "AppWindow.c"
+				goto __catch232_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3848,7 +3828,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3821 "AppWindow.c"
+#line 3800 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3862,10 +3842,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3835 "AppWindow.c"
+#line 3814 "AppWindow.c"
 	}
-	goto __finally231;
-	__catch231_g_regex_error:
+	goto __finally232;
+	__catch232_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3876,9 +3856,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3849 "AppWindow.c"
+#line 3828 "AppWindow.c"
 	}
-	__finally231:
+	__finally232:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3887,7 +3867,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3860 "AppWindow.c"
+#line 3839 "AppWindow.c"
 	}
 }
 
@@ -3898,53 +3878,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3885 "AppWindow.c"
+#line 3864 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#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"
 		tmp = _tmp6_;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp5_);
 #line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp5_);
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3917 "AppWindow.c"
+#line 3896 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -3954,44 +3934,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#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"
 		tmp = _tmp13_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp10_);
 #line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp10_);
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3959 "AppWindow.c"
+#line 3938 "AppWindow.c"
 		}
 	}
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3964 "AppWindow.c"
+#line 3943 "AppWindow.c"
 }
 
 
@@ -4000,42 +3980,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 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (url != NULL);
 #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (url != NULL);
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3991 "AppWindow.c"
+#line 3970 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_add_actions (AppWindow* self) {
-#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 676 "/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 3999 "AppWindow.c"
+#line 3978 "AppWindow.c"
 }
 
 
 void app_window_add_actions (AppWindow* self) {
-#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 4008 "AppWindow.c"
+#line 3987 "AppWindow.c"
 }
 
 
@@ -4052,81 +4032,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_ = NULL;
 	FullscreenWindow* _tmp13_ = NULL;
 	FullscreenWindow* _tmp14_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4033 "AppWindow.c"
+#line 4012 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4041 "AppWindow.c"
+#line 4020 "AppWindow.c"
 	}
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 687 "/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 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->pos_y = _tmp3_;
 #line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self->pos_y = _tmp3_;
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = 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"
 	_tmp7_ = _tmp6_;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4069 "AppWindow.c"
+#line 4048 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4083 "AppWindow.c"
+#line 4062 "AppWindow.c"
 	}
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_fullscreen_window = _tmp13_;
 #line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_fullscreen_window = _tmp13_;
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4099 "AppWindow.c"
+#line 4078 "AppWindow.c"
 }
 
 
@@ -4139,65 +4119,65 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_ = FALSE;
 	FullscreenWindow* _tmp9_ = NULL;
 	FullscreenWindow* _tmp10_ = NULL;
-#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"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp0_ == NULL) {
 #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp0_ == NULL) {
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4120 "AppWindow.c"
+#line 4099 "AppWindow.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = 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"
 	_tmp4_ = _tmp3_;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4140 "AppWindow.c"
+#line 4119 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4154 "AppWindow.c"
+#line 4133 "AppWindow.c"
 	}
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#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"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#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"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4170 "AppWindow.c"
+#line 4149 "AppWindow.c"
 }
 
 
@@ -4206,21 +4186,21 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), 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"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/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 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp2_;
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4193 "AppWindow.c"
+#line 4172 "AppWindow.c"
 }
 
 
@@ -4230,42 +4210,42 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4217 "AppWindow.c"
+#line 4196 "AppWindow.c"
 	}
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4225 "AppWindow.c"
+#line 4204 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4234 "AppWindow.c"
+#line 4213 "AppWindow.c"
 	}
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4238 "AppWindow.c"
+#line 4217 "AppWindow.c"
 }
 
 
@@ -4275,45 +4255,45 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4262 "AppWindow.c"
+#line 4241 "AppWindow.c"
 	}
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4270 "AppWindow.c"
+#line 4249 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4282 "AppWindow.c"
+#line 4261 "AppWindow.c"
 	}
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4286 "AppWindow.c"
+#line 4265 "AppWindow.c"
 }
 
 
@@ -4323,66 +4303,66 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4310 "AppWindow.c"
+#line 4289 "AppWindow.c"
 	}
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4318 "AppWindow.c"
+#line 4297 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4330 "AppWindow.c"
+#line 4309 "AppWindow.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4334 "AppWindow.c"
+#line 4313 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, 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 4341 "AppWindow.c"
+#line 4320 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, 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 4348 "AppWindow.c"
+#line 4327 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4355 "AppWindow.c"
+#line 4334 "AppWindow.c"
 }
 
 
@@ -4394,23 +4374,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_ = NULL;
 	Page* _tmp34_ = NULL;
 	Page* _tmp35_ = NULL;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_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"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4383 "AppWindow.c"
+#line 4362 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4423,49 +4403,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		guint _tmp14_ = 0U;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, 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 (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 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, 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 (_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 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp9_);
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp9_);
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_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 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4432 "AppWindow.c"
+#line 4411 "AppWindow.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4438 "AppWindow.c"
+#line 4417 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -4484,135 +4464,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_ = NULL;
 		ViewCollection* _tmp32_ = NULL;
 		gint _tmp33_ = 0;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/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 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp18_);
 #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp18_);
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/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 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp21_);
 #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp21_);
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/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 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4511 "AppWindow.c"
+#line 4490 "AppWindow.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/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 4519 "AppWindow.c"
+#line 4498 "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 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_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"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#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, "CommonSelectAll", is_checkerboard);
+#line 767 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4538 "AppWindow.c"
+#line 4517 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4547 "AppWindow.c"
+#line 4526 "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 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4560 "AppWindow.c"
+#line 4539 "AppWindow.c"
 		gint _tmp1_ = 0;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = 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, "CommonSelectAll", _tmp1_ > 0);
-#line 4566 "AppWindow.c"
+#line 4545 "AppWindow.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#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_undo_action (self);
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4576 "AppWindow.c"
+#line 4555 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4585 "AppWindow.c"
+#line 4564 "AppWindow.c"
 }
 
 
@@ -4620,17 +4600,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#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"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = _tmp0_;
 #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = _tmp0_;
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4603 "AppWindow.c"
+#line 4582 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -4640,35 +4620,35 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4637 "AppWindow.c"
+#line 4616 "AppWindow.c"
 	}
-#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4641 "AppWindow.c"
+#line 4620 "AppWindow.c"
 }
 
 
@@ -4683,61 +4663,61 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	gint items = 0;
 	GMenu* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (id != NULL);
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (new_label != NULL);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/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"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_menubar (_tmp1_);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/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"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4674 "AppWindow.c"
+#line 4653 "AppWindow.c"
 	}
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	bar = _tmp4_;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/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"
+	if (_tmp5_ == NULL) {
+#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (bar);
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4690 "AppWindow.c"
+#line 4669 "AppWindow.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 796 "/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"
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4698 "AppWindow.c"
+#line 4677 "AppWindow.c"
 	{
 		gint i = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4703 "AppWindow.c"
+#line 4682 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4710 "AppWindow.c"
+#line 4689 "AppWindow.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				GMenuModel* model = NULL;
@@ -4748,65 +4728,65 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				gint model_items = 0;
 				GMenuModel* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4723 "AppWindow.c"
+#line 4702 "AppWindow.c"
 					gint _tmp9_ = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4729 "AppWindow.c"
+#line 4708 "AppWindow.c"
 				}
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp10_ = i;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp11_ = items;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4741 "AppWindow.c"
+#line 4720 "AppWindow.c"
 				}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp13_ = i;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/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"
+				model = _tmp14_;
+#line 799 "/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"
+				if (_tmp15_ == NULL) {
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_g_object_unref0 (model);
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4759 "AppWindow.c"
+#line 4738 "AppWindow.c"
 				}
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4767 "AppWindow.c"
+#line 4746 "AppWindow.c"
 				{
 					gint j = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4772 "AppWindow.c"
+#line 4751 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4779 "AppWindow.c"
+#line 4758 "AppWindow.c"
 							gint _tmp20_ = 0;
 							gint _tmp21_ = 0;
 							GMenuModel* subsection = NULL;
@@ -4817,168 +4797,168 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							gint sub_items = 0;
 							GMenuModel* _tmp26_ = NULL;
 							gint _tmp27_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4792 "AppWindow.c"
+#line 4771 "AppWindow.c"
 								gint _tmp19_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4798 "AppWindow.c"
+#line 4777 "AppWindow.c"
 							}
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp20_ = j;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp21_ = model_items;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!(_tmp20_ < _tmp21_)) {
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4810 "AppWindow.c"
+#line 4789 "AppWindow.c"
 							}
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp23_ = j;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/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"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							subsection = _tmp24_;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/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"
+							if (_tmp25_ == NULL) {
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_g_object_unref0 (subsection);
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4828 "AppWindow.c"
+#line 4807 "AppWindow.c"
 							}
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4836 "AppWindow.c"
+#line 4815 "AppWindow.c"
 							{
 								gint k = 0;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4841 "AppWindow.c"
+#line 4820 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4848 "AppWindow.c"
+#line 4827 "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"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4857 "AppWindow.c"
+#line 4836 "AppWindow.c"
 											gint _tmp29_ = 0;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4863 "AppWindow.c"
+#line 4842 "AppWindow.c"
 										}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp30_ = k;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp31_ = sub_items;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!(_tmp30_ < _tmp31_)) {
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4875 "AppWindow.c"
+#line 4854 "AppWindow.c"
 										}
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp33_ = k;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/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"
+										it = _tmp34_;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4887 "AppWindow.c"
+#line 4866 "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"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp35_ = it;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp36_ = g_menu_attribute_iter_next (_tmp35_);
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (!_tmp36_) {
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4902 "AppWindow.c"
+#line 4881 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4910 "AppWindow.c"
+#line 4889 "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"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp41_ = it;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp42_ = g_menu_attribute_iter_get_value (_tmp41_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp43_ = _tmp42_;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp44_ = g_variant_get_string (_tmp43_, NULL);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp45_ = id;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4930 "AppWindow.c"
+#line 4909 "AppWindow.c"
 											} else {
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4934 "AppWindow.c"
+#line 4913 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4940 "AppWindow.c"
+#line 4919 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
 												GMenuAttributeIter* _tmp47_ = NULL;
 												const gchar* _tmp48_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp47_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4951 "AppWindow.c"
+#line 4930 "AppWindow.c"
 													GMenuAttributeIter* _tmp49_ = NULL;
 													GVariant* _tmp50_ = NULL;
 													GVariant* _tmp51_ = NULL;
@@ -4987,41 +4967,41 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													gchar* _tmp54_ = NULL;
 													gchar* _tmp55_ = NULL;
 													gboolean _tmp56_ = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp49_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp50_ = g_menu_attribute_iter_get_value (_tmp49_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp51_ = _tmp50_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp52_ = g_variant_get_string (_tmp51_, NULL);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp53_ = id;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp54_ = g_strconcat (".", _tmp53_, NULL);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp55_ = _tmp54_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = _tmp56_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_free0 (_tmp55_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4982 "AppWindow.c"
+#line 4961 "AppWindow.c"
 												} else {
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4986 "AppWindow.c"
+#line 4965 "AppWindow.c"
 												}
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4990 "AppWindow.c"
+#line 4969 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 4994 "AppWindow.c"
+#line 4973 "AppWindow.c"
 												GMenu* md = NULL;
 												GMenuModel* _tmp57_ = NULL;
 												GMenu* _tmp58_ = NULL;
@@ -5036,85 +5016,85 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												GMenu* _tmp66_ = NULL;
 												gint _tmp67_ = 0;
 												GMenuItem* _tmp68_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp57_ = subsection;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/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"
+												md = _tmp58_;
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp59_ = subsection;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp60_ = k;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/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"
+												m = _tmp61_;
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp62_ = m;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/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"
+												g_menu_item_set_label (_tmp62_, _tmp63_);
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp64_ = md;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/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"
+												g_menu_remove (_tmp64_, _tmp65_);
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp66_ = md;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp67_ = k;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp68_ = m;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (m);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (md);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (it);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (subsection);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (model);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (bar);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5057 "AppWindow.c"
+#line 5036 "AppWindow.c"
 											}
 										}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5062 "AppWindow.c"
+#line 5041 "AppWindow.c"
 									}
 								}
 							}
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5068 "AppWindow.c"
+#line 5047 "AppWindow.c"
 						}
 					}
 				}
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5074 "AppWindow.c"
+#line 5053 "AppWindow.c"
 			}
 		}
 	}
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5080 "AppWindow.c"
+#line 5059 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5087 "AppWindow.c"
+#line 5066 "AppWindow.c"
 }
 
 
@@ -5122,26 +5102,26 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5103 "AppWindow.c"
+#line 5082 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
+	g_return_if_fail (IS_APP_WINDOW (self));
 #line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5114 "AppWindow.c"
+#line 5093 "AppWindow.c"
 }
 
 
@@ -5157,51 +5137,51 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	CommandDescription* _tmp6_ = NULL;
 	const gchar* _tmp18_ = NULL;
 	const gchar* _tmp19_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/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"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5150 "AppWindow.c"
+#line 5129 "AppWindow.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 845 "/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"
+	if (_tmp3_ == NULL) {
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (action);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5162 "AppWindow.c"
+#line 5141 "AppWindow.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	label = _tmp5_;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = desc;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5174 "AppWindow.c"
+#line 5153 "AppWindow.c"
 		const gchar* _tmp7_ = NULL;
 		CommandDescription* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5210,62 +5190,62 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		GSimpleAction* _tmp14_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = label;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = desc;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = command_description_get_name (_tmp8_);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_strconcat (" ", _tmp10_, NULL);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		label = _tmp13_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/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"
+		_g_free0 (_tmp10_);
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = action;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5209 "AppWindow.c"
+#line 5188 "AppWindow.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		GSimpleAction* _tmp17_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp15_ = prefix;
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/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"
+		label = _tmp16_;
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = action;
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5226 "AppWindow.c"
+#line 5205 "AppWindow.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = label;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/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"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (label);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5238 "AppWindow.c"
+#line 5217 "AppWindow.c"
 }
 
 
@@ -5274,23 +5254,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5263 "AppWindow.c"
+#line 5242 "AppWindow.c"
 }
 
 
@@ -5299,47 +5279,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5288 "AppWindow.c"
+#line 5267 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5300 "AppWindow.c"
+#line 5279 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5312 "AppWindow.c"
+#line 5291 "AppWindow.c"
 }
 
 
@@ -5348,43 +5328,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5331 "AppWindow.c"
+#line 5310 "AppWindow.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5339 "AppWindow.c"
+#line 5318 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5353 "AppWindow.c"
+#line 5332 "AppWindow.c"
 	}
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5357 "AppWindow.c"
+#line 5336 "AppWindow.c"
 }
 
 
@@ -5393,43 +5373,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5376 "AppWindow.c"
+#line 5355 "AppWindow.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5384 "AppWindow.c"
+#line 5363 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5398 "AppWindow.c"
+#line 5377 "AppWindow.c"
 	}
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5402 "AppWindow.c"
+#line 5381 "AppWindow.c"
 }
 
 
@@ -5441,40 +5421,40 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_ = FALSE;
 	GdkEventConfigure* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5428 "AppWindow.c"
+#line 5407 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/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 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5437 "AppWindow.c"
+#line 5416 "AppWindow.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/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 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5447 "AppWindow.c"
+#line 5426 "AppWindow.c"
 }
 
 
@@ -5501,7 +5481,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 5474 "AppWindow.c"
+#line 5453 "AppWindow.c"
 }
 
 
@@ -5512,7 +5492,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 5485 "AppWindow.c"
+#line 5464 "AppWindow.c"
 }
 
 
@@ -5522,7 +5502,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 5495 "AppWindow.c"
+#line 5474 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 3b69156..a151c9a 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -477,8 +477,7 @@ public abstract class AppWindow : PageWindow {
     public static Gtk.Builder create_builder(string glade_filename = "shotwell.ui", void *user = null) {
         Gtk.Builder builder = new Gtk.Builder();
         try {
-            builder.add_from_file(AppDirs.get_resources_dir().get_child("ui").get_child(
-                glade_filename).get_path());
+            builder.add_from_resource(Resources.get_ui(glade_filename));
         } catch(GLib.Error error) {
             warning("Unable to create Gtk.Builder: %s\n", error.message);
         }
@@ -591,8 +590,9 @@ public abstract class AppWindow : PageWindow {
     public abstract string get_app_role();
 
     protected void on_about() {
+        const string[] artists = { "Aachen logo under public domain license https://www.flickr.com/photos/30784528@N04/10860988196/", null };
         Gtk.show_about_dialog(this,
-            "version", Resources.APP_VERSION,
+            "version", Resources.APP_VERSION + " \u2013 \"Aachen\"",
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
             "website", Resources.HOME_URL,
@@ -600,6 +600,7 @@ public abstract class AppWindow : PageWindow {
             "website-label", _("Visit the Shotwell web site"),
             "authors", Resources.AUTHORS,
             "logo", Resources.get_icon(Resources.ICON_ABOUT_LOGO, -1),
+            "artists", artists,
             "translator-credits", _("translator-credits"),
             null
         );
diff --git a/src/Application.c b/src/Application.c
index 9d858e4..edc55d2 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -265,11 +265,11 @@ static Application* application_construct (GType object_type, gboolean is_direct
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 268 "Application.c"
-			goto __catch557_g_error;
+			goto __catch559_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally559;
+	__catch559_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -282,7 +282,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_error_free0 (e);
 #line 284 "Application.c"
 	}
-	__finally557:
+	__finally559:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 032c624..5904344 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -5770,14 +5770,14 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5773 "BatchImport.c"
-					goto __catch409_g_error;
+					goto __catch410_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
 #line 5778 "BatchImport.c"
 			}
-			goto __finally409;
-			__catch409_g_error:
+			goto __finally410;
+			__catch410_g_error:
 			{
 				GError* err = NULL;
 				BatchImportResult* _tmp15_ = NULL;
@@ -5810,7 +5810,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				_g_error_free0 (err);
 #line 5812 "BatchImport.c"
 			}
-			__finally409:
+			__finally410:
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8899,11 +8899,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8898 "BatchImport.c"
-						goto __catch410_g_error;
+						goto __catch411_g_error;
 					}
 				}
-				goto __finally410;
-				__catch410_g_error:
+				goto __finally411;
+				__catch411_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp68_ = NULL;
@@ -8929,7 +8929,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					_g_error_free0 (e);
 #line 8926 "BatchImport.c"
 				}
-				__finally410:
+				__finally411:
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9894,11 +9894,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9891 "BatchImport.c"
-					goto __catch411_g_error;
+					goto __catch412_g_error;
 				}
 			}
-			goto __finally411;
-			__catch411_g_error:
+			goto __finally412;
+			__catch412_g_error:
 			{
 				GError* err = NULL;
 				MediaSource* _tmp65_ = NULL;
@@ -9929,7 +9929,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_g_error_free0 (err);
 #line 9924 "BatchImport.c"
 			}
-			__finally411:
+			__finally412:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11931,11 +11931,11 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 #line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11927 "BatchImport.c"
-					goto __catch412_g_error;
+					goto __catch413_g_error;
 				}
 			}
-			goto __finally412;
-			__catch412_g_error:
+			goto __finally413;
+			__catch413_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp17_ = NULL;
@@ -11976,7 +11976,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_error_free0 (err);
 #line 11971 "BatchImport.c"
 			}
-			__finally412:
+			__finally413:
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12676,11 +12676,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12672 "BatchImport.c"
-				goto __catch413_g_error;
+				goto __catch414_g_error;
 			}
 		}
-		goto __finally413;
-		__catch413_g_error:
+		goto __finally414;
+		__catch414_g_error:
 		{
 			GError* err = NULL;
 			BatchImportJob* _tmp26_ = NULL;
@@ -12724,7 +12724,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_error_free0 (err);
 #line 12719 "BatchImport.c"
 		}
-		__finally413:
+		__finally414:
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13013,11 +13013,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 #line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13009 "BatchImport.c"
-					goto __catch414_g_error;
+					goto __catch415_g_error;
 				}
 			}
-			goto __finally414;
-			__catch414_g_error:
+			goto __finally415;
+			__catch415_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp24_ = NULL;
@@ -13061,7 +13061,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_error_free0 (err);
 #line 13056 "BatchImport.c"
 			}
-			__finally414:
+			__finally415:
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14580,7 +14580,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14576 "BatchImport.c"
-			goto __catch415_g_error;
+			goto __catch416_g_error;
 		}
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
@@ -14635,8 +14635,8 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 14629 "BatchImport.c"
 		}
 	}
-	goto __finally415;
-	__catch415_g_error:
+	goto __finally416;
+	__catch416_g_error:
 	{
 		GError* err = NULL;
 		BatchImportJob* _tmp12_ = NULL;
@@ -14697,7 +14697,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		return result;
 #line 14692 "BatchImport.c"
 	}
-	__finally415:
+	__finally416:
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14953,7 +14953,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14949 "BatchImport.c"
-			goto __catch416_g_error;
+			goto __catch417_g_error;
 		}
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp17_;
@@ -14967,8 +14967,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_g_free0 (_tmp17_);
 #line 14962 "BatchImport.c"
 	}
-	goto __finally416;
-	__catch416_g_error:
+	goto __finally417;
+	__catch417_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp21_ = NULL;
@@ -15024,7 +15024,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15019 "BatchImport.c"
 	}
-	__finally416:
+	__finally417:
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15135,7 +15135,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15131 "BatchImport.c"
-				goto __catch417_g_error;
+				goto __catch418_g_error;
 			}
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp41_;
@@ -15149,8 +15149,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_media_metadata_unref0 (_tmp41_);
 #line 15144 "BatchImport.c"
 		}
-		goto __finally417;
-		__catch417_g_error:
+		goto __finally418;
+		__catch418_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp45_ = NULL;
@@ -15181,7 +15181,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_g_error_free0 (err);
 #line 15175 "BatchImport.c"
 		}
-		__finally417:
+		__finally418:
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15374,14 +15374,14 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15369 "BatchImport.c"
-			goto __catch418_g_error;
+			goto __catch419_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
 #line 15374 "BatchImport.c"
 	}
-	goto __finally418;
-	__catch418_g_error:
+	goto __finally419;
+	__catch419_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp75_ = NULL;
@@ -15437,7 +15437,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15431 "BatchImport.c"
 	}
-	__finally418:
+	__finally419:
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15832,11 +15832,11 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15827 "BatchImport.c"
-				goto __catch419_g_error;
+				goto __catch420_g_error;
 			}
 		}
-		goto __finally419;
-		__catch419_g_error:
+		goto __finally420;
+		__catch420_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp9_ = NULL;
@@ -15867,7 +15867,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			_g_error_free0 (err);
 #line 15860 "BatchImport.c"
 		}
-		__finally419:
+		__finally420:
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16384,7 +16384,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16378 "BatchImport.c"
-				goto __catch420_g_error;
+				goto __catch421_g_error;
 			}
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _tmp10_;
@@ -16481,7 +16481,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
 #line 16475 "BatchImport.c"
-					goto __catch420_g_error;
+					goto __catch421_g_error;
 				}
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = _tmp30_;
@@ -16499,8 +16499,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_object_unref0 (_tmp10_);
 #line 16492 "BatchImport.c"
 		}
-		goto __finally420;
-		__catch420_g_error:
+		goto __finally421;
+		__catch421_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp35_ = NULL;
@@ -16591,7 +16591,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			return;
 #line 16584 "BatchImport.c"
 		}
-		__finally420:
+		__finally421:
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16778,11 +16778,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16772 "BatchImport.c"
-				goto __catch421_g_error;
+				goto __catch422_g_error;
 			}
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally422;
+		__catch422_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp91_ = NULL;
@@ -16812,7 +16812,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_error_free0 (err);
 #line 16805 "BatchImport.c"
 		}
-		__finally421:
+		__finally422:
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17393,7 +17393,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 #line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17387 "BatchImport.c"
-			goto __catch422_g_error;
+			goto __catch423_g_error;
 		}
 #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->completed_import_source;
@@ -17403,8 +17403,8 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
 #line 17396 "BatchImport.c"
 	}
-	goto __finally422;
-	__catch422_g_error:
+	goto __finally423;
+	__catch423_g_error:
 	{
 		GError* err = NULL;
 		CompletedImportObject* _tmp6_ = NULL;
@@ -17429,7 +17429,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 17422 "BatchImport.c"
 	}
-	__finally422:
+	__finally423:
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 3febf08..27cf4da 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1777,7 +1777,7 @@ private class PrepareFilesJob : BackgroundImportJob {
     private ImportResult prepare_file(BatchImportJob job, File file, File? associated_file, 
         bool copy_to_library, out PreparedFile prepared_file) {
         prepared_file = null;
-        
+
         bool is_video = VideoReader.is_supported_video_file(file);
         
         if ((!is_video) && (!Photo.is_file_image(file)))
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index b5d30e5..bf8c368 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1422,7 +1422,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1425 "CheckerboardLayout.c"
-				goto __catch241_g_regex_error;
+				goto __catch242_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -1447,7 +1447,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1450 "CheckerboardLayout.c"
-				goto __catch241_g_regex_error;
+				goto __catch242_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1473,8 +1473,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1475 "CheckerboardLayout.c"
 	}
-	goto __finally241;
-	__catch241_g_regex_error:
+	goto __finally242;
+	__catch242_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1487,7 +1487,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1489 "CheckerboardLayout.c"
 	}
-	__finally241:
+	__finally242:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index afd1659..991dadb 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1488,112 +1488,112 @@ 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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_print ((CollectionPage*) self);
 #line 1494 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_publish ((CollectionPage*) self);
 #line 1501 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_clockwise ((CollectionPage*) self);
 #line 1508 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
 #line 1515 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_horizontally ((CollectionPage*) self);
 #line 1522 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_vertically ((CollectionPage*) self);
 #line 1529 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_enhance ((CollectionPage*) self);
 #line 1536 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_copy_adjustments ((CollectionPage*) self);
 #line 1543 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_paste_adjustments ((CollectionPage*) self);
 #line 1550 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_revert ((CollectionPage*) self);
 #line 1557 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_set_background ((CollectionPage*) self);
 #line 1564 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_duplicate_photo ((CollectionPage*) self);
 #line 1571 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_adjust_date_time ((CollectionPage*) self);
 #line 1578 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit ((CollectionPage*) self);
 #line 1585 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit_raw ((CollectionPage*) self);
 #line 1592 "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"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_slideshow ((CollectionPage*) self);
 #line 1599 "CollectionPage.c"
 }
@@ -1658,8 +1658,8 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	CollectionPage * self;
 	GtkToolbar* result = NULL;
 	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp20_ = NULL;
-	GtkToolbar* _tmp21_ = NULL;
+	GtkToolbar* _tmp28_ = NULL;
+	GtkToolbar* _tmp29_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1689,6 +1689,16 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		GtkToolbar* _tmp17_ = NULL;
 		GtkToolbar* _tmp18_ = NULL;
 		MediaPageZoomSliderAssembly* _tmp19_ = NULL;
+		GtkToolButton* rotate_button = NULL;
+		GtkBuilder* _tmp20_ = NULL;
+		GObject* _tmp21_ = NULL;
+		GtkToolButton* _tmp22_ = NULL;
+		GtkBindingSet* binding_set = NULL;
+		GtkToolButton* _tmp23_ = NULL;
+		GObjectClass* _tmp24_ = NULL;
+		GtkBindingSet* _tmp25_ = NULL;
+		GtkBindingSet* _tmp26_ = NULL;
+		GtkBindingSet* _tmp27_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = PAGE_CLASS (collection_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page));
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1761,23 +1771,49 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		gtk_toolbar_insert (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 65 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "ToolRotate");
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp21_) : NULL);
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		rotate_button = _tmp22_;
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = rotate_button;
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp24_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, G_TYPE_OBJECT, GObject));
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp25_ = gtk_binding_set_by_class (_tmp24_);
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		binding_set = _tmp25_;
+#line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp26_ = binding_set;
+#line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_binding_entry_add_signal (_tmp26_, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 70 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = binding_set;
+#line 70 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_binding_entry_add_signal (_tmp27_, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (rotate_button);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (zoom_slider_assembly);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (drawn_separator);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (separator);
-#line 1771 "CollectionPage.c"
+#line 1807 "CollectionPage.c"
 	}
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp21_ = _g_object_ref0 (_tmp20_);
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	result = _tmp21_;
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp29_ = _g_object_ref0 (_tmp28_);
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	result = _tmp29_;
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1781 "CollectionPage.c"
+#line 1817 "CollectionPage.c"
 }
 
 
@@ -1789,33 +1825,33 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("FileExtrasPlaceholder");
-#line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("_Print");
-#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "Print", "<Primary>p");
-#line 75 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("_Publish");
-#line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "Publish", "<Primary><Shift>p");
-#line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("Send _To…");
-#line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "SendTo", NULL);
-#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _ ("Set as _Desktop Background");
-#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp4_, "SetBackground", "<Primary>b");
-#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1819 "CollectionPage.c"
+#line 1855 "CollectionPage.c"
 }
 
 
@@ -1824,19 +1860,19 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("EditExtrasPlaceholder");
-#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("_Duplicate");
-#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "Duplicate", "<Primary>D");
-#line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1840 "CollectionPage.c"
+#line 1876 "CollectionPage.c"
 }
 
 
@@ -1846,25 +1882,25 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("ViewExtrasFullscreenSlideshowPlaceholder");
-#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Fullscreen");
-#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "CommonFullscreen", "F11");
-#line 95 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("S_lideshow");
-#line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "Slideshow", "F5");
-#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1868 "CollectionPage.c"
+#line 1904 "CollectionPage.c"
 }
 
 
@@ -1880,51 +1916,51 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasEditsPlaceholder");
-#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Rotate _Right");
-#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "RotateClockwise", "<Primary>r");
-#line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("Rotate _Left");
-#line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "RotateCounterclockwise", "<Primary><Shift>r");
-#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("Flip Hori_zontally");
-#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "FlipHorizontally", NULL);
-#line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _ ("Flip Verti_cally");
-#line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp4_, "FlipVertically", NULL);
-#line 112 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _ ("_Enhance");
-#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp5_, "Enhance", NULL);
-#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _ ("Re_vert to Original");
-#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp6_, "Revert", NULL);
-#line 115 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _ ("_Copy Color Adjustments");
-#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp7_, "CopyColorAdjustments", "<Primary><Shift>c");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("_Paste Color Adjustments");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp8_, "PasteColorAdjustments", "<Primary><Shift>v");
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1928 "CollectionPage.c"
+#line 1964 "CollectionPage.c"
 }
 
 
@@ -1933,19 +1969,19 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasDateTimePlaceholder");
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Adjust Date and Time…");
-#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "AdjustDateTime", NULL);
-#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1949 "CollectionPage.c"
+#line 1985 "CollectionPage.c"
 }
 
 
@@ -1956,27 +1992,27 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasExternalsPlaceholder");
-#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Open With E_xternal Editor");
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "ExternalEdit", "<Primary>Return");
-#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("Open With RA_W Editor");
-#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "ExternalEditRAW", "<Primary><Shift>Return");
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("_Play");
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "PlayVideo", "<Primary>Y");
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1980 "CollectionPage.c"
+#line 2016 "CollectionPage.c"
 }
 
 
@@ -1984,19 +2020,19 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	CollectionPage * self;
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = ui_filenames;
-#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = ui_filenames;
-#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 2000 "CollectionPage.c"
+#line 2036 "CollectionPage.c"
 }
 
 
@@ -2004,63 +2040,63 @@ static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
 	GActionMap* _tmp0_ = NULL;
 	GActionMap* _tmp1_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 174 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = map;
-#line 174 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = map;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
-#line 2020 "CollectionPage.c"
+#line 2056 "CollectionPage.c"
 }
 
 
 static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
 	GActionMap* _tmp0_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = map;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 2035 "CollectionPage.c"
+#line 2071 "CollectionPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		entry_collection = COLLECTION_PAGE_entries;
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) {
-#line 2047 "CollectionPage.c"
+#line 2083 "CollectionPage.c"
 			GActionEntry entry = {0};
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			entry = entry_collection[entry_it];
-#line 2051 "CollectionPage.c"
+#line 2087 "CollectionPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp1_ = map;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp2_ = entry;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2064 "CollectionPage.c"
+#line 2100 "CollectionPage.c"
 			}
 		}
 	}
@@ -2068,104 +2104,104 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 
 
 static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2078 "CollectionPage.c"
+#line 2114 "CollectionPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2084 "CollectionPage.c"
+#line 2120 "CollectionPage.c"
 }
 
 
 static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2095 "CollectionPage.c"
+#line 2131 "CollectionPage.c"
 	}
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2101 "CollectionPage.c"
+#line 2137 "CollectionPage.c"
 }
 
 
 static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2112 "CollectionPage.c"
+#line 2148 "CollectionPage.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2118 "CollectionPage.c"
+#line 2154 "CollectionPage.c"
 }
 
 
 static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2129 "CollectionPage.c"
+#line 2165 "CollectionPage.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2135 "CollectionPage.c"
+#line 2171 "CollectionPage.c"
 }
 
 
 static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2146 "CollectionPage.c"
+#line 2182 "CollectionPage.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2152 "CollectionPage.c"
+#line 2188 "CollectionPage.c"
 }
 
 
 static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2163 "CollectionPage.c"
+#line 2199 "CollectionPage.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2169 "CollectionPage.c"
+#line 2205 "CollectionPage.c"
 }
 
 
@@ -2197,79 +2233,79 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = PAGE_CLASS (collection_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), &_tmp0_);
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups = _tmp1_;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups_length1 = _tmp0_;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_groups_size_ = groups_length1;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = groups;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2__length1 = groups_length1;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add76 (&groups, &groups_length1, &_groups_size_, _tmp3_);
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add77 (&groups, &groups_length1, &_groups_size_, _tmp5_);
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6__length1 = groups_length1;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add78 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp9_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10__length1 = groups_length1;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp11_);
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp13_);
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (result_length1) {
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2267 "CollectionPage.c"
+#line 2303 "CollectionPage.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2273 "CollectionPage.c"
+#line 2309 "CollectionPage.c"
 }
 
 
@@ -2281,29 +2317,29 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_video (_tmp3_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2307 "CollectionPage.c"
+#line 2343 "CollectionPage.c"
 }
 
 
@@ -2315,29 +2351,29 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_sources (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2341 "CollectionPage.c"
+#line 2377 "CollectionPage.c"
 }
 
 
@@ -2349,29 +2385,29 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2375 "CollectionPage.c"
+#line 2411 "CollectionPage.c"
 }
 
 
@@ -2379,29 +2415,29 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	CollectionPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = selected_count;
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = count;
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", RESOURCES_ROTATE_CW_LABEL);
-#line 215 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", RESOURCES_ROTATE_CCW_LABEL);
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", RESOURCES_PUBLISH_LABEL);
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 224 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", TRUE);
-#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2405 "CollectionPage.c"
+#line 2441 "CollectionPage.c"
 }
 
 
@@ -2463,49 +2499,49 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	gboolean _tmp92_ = FALSE;
 	gboolean _tmp93_ = FALSE;
 	gboolean _tmp95_ = FALSE;
-#line 224 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_ != G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2487 "CollectionPage.c"
+#line 2523 "CollectionPage.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = count;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp5_, _tmp6_);
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = selected_count;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	one_selected = _tmp7_ == 1;
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = selected_count;
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_selected = _tmp8_ > 0;
-#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	primary_is_video = FALSE;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = has_selected;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2509 "CollectionPage.c"
+#line 2545 "CollectionPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		DataView* _tmp12_ = NULL;
@@ -2513,116 +2549,116 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp14_ = NULL;
 		DataSource* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = data_view_get_source (_tmp13_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp16_) {
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2541 "CollectionPage.c"
+#line 2577 "CollectionPage.c"
 		}
 	}
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = collection_page_selection_has_video (self);
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selection_has_videos = _tmp17_;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp18_ = collection_page_page_has_photo (self);
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_has_photos = _tmp18_;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = has_selected;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2556 "CollectionPage.c"
+#line 2592 "CollectionPage.c"
 		gboolean _tmp21_ = FALSE;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2562 "CollectionPage.c"
+#line 2598 "CollectionPage.c"
 	} else {
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2566 "CollectionPage.c"
+#line 2602 "CollectionPage.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = primary_is_video;
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", !_tmp22_);
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = one_selected;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp24_) {
-#line 2578 "CollectionPage.c"
+#line 2614 "CollectionPage.c"
 		ConfigFacade* _tmp25_ = NULL;
 		ConfigFacade* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = config_facade_get_instance ();
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = _tmp25_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp28_ = _tmp27_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp29_ = is_string_empty (_tmp28_);
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp28_);
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2600 "CollectionPage.c"
+#line 2636 "CollectionPage.c"
 	} else {
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = FALSE;
-#line 2604 "CollectionPage.c"
+#line 2640 "CollectionPage.c"
 	}
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = one_selected;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp33_) {
-#line 2612 "CollectionPage.c"
+#line 2648 "CollectionPage.c"
 		gboolean _tmp34_ = FALSE;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp34_ = primary_is_video;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = !_tmp34_;
-#line 2618 "CollectionPage.c"
+#line 2654 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = FALSE;
-#line 2622 "CollectionPage.c"
+#line 2658 "CollectionPage.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_) {
-#line 2626 "CollectionPage.c"
+#line 2662 "CollectionPage.c"
 		ViewCollection* _tmp35_ = NULL;
 		ViewCollection* _tmp36_ = NULL;
 		DataView* _tmp37_ = NULL;
@@ -2630,121 +2666,121 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp39_ = NULL;
 		Photo* _tmp40_ = NULL;
 		PhotoFileFormat _tmp41_ = 0;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp36_ = _tmp35_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp37_ = view_collection_get_selected_at (_tmp36_, 0);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp38_ = _tmp37_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp39_ = data_view_get_source (_tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = photo_get_master_file_format (_tmp40_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = _tmp41_ == PHOTO_FILE_FORMAT_RAW;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp40_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp36_);
-#line 2656 "CollectionPage.c"
+#line 2692 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = FALSE;
-#line 2660 "CollectionPage.c"
+#line 2696 "CollectionPage.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_) {
-#line 2664 "CollectionPage.c"
+#line 2700 "CollectionPage.c"
 		ConfigFacade* _tmp42_ = NULL;
 		ConfigFacade* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		gchar* _tmp45_ = NULL;
 		gboolean _tmp46_ = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = config_facade_get_instance ();
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = _tmp44_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = is_string_empty (_tmp45_);
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = !_tmp46_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp45_);
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 2686 "CollectionPage.c"
+#line 2722 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = FALSE;
-#line 2690 "CollectionPage.c"
+#line 2726 "CollectionPage.c"
 	}
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_);
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp48_ = selection_has_videos;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp48_) {
-#line 2698 "CollectionPage.c"
+#line 2734 "CollectionPage.c"
 		gboolean _tmp49_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = collection_page_can_revert_selected (self);
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = _tmp49_;
-#line 2704 "CollectionPage.c"
+#line 2740 "CollectionPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = FALSE;
-#line 2708 "CollectionPage.c"
+#line 2744 "CollectionPage.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp51_ = selection_has_videos;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp51_) {
-#line 2716 "CollectionPage.c"
+#line 2752 "CollectionPage.c"
 		gboolean _tmp52_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp52_ = has_selected;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp52_;
-#line 2722 "CollectionPage.c"
+#line 2758 "CollectionPage.c"
 	} else {
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = FALSE;
-#line 2726 "CollectionPage.c"
+#line 2762 "CollectionPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp55_ = selection_has_videos;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp55_) {
-#line 2734 "CollectionPage.c"
+#line 2770 "CollectionPage.c"
 		gboolean _tmp56_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = one_selected;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp56_;
-#line 2740 "CollectionPage.c"
+#line 2776 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = FALSE;
-#line 2744 "CollectionPage.c"
+#line 2780 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp54_) {
-#line 2748 "CollectionPage.c"
+#line 2784 "CollectionPage.c"
 		ViewCollection* _tmp57_ = NULL;
 		ViewCollection* _tmp58_ = NULL;
 		DataView* _tmp59_ = NULL;
@@ -2752,259 +2788,259 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp61_ = NULL;
 		Photo* _tmp62_ = NULL;
 		gboolean _tmp63_ = FALSE;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = view_collection_get_selected_at (_tmp58_, 0);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = data_view_get_source (_tmp60_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp62_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_PHOTO, Photo);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp63_ = photo_has_color_adjustments (_tmp62_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = _tmp63_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp62_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp58_);
-#line 2778 "CollectionPage.c"
+#line 2814 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = FALSE;
-#line 2782 "CollectionPage.c"
+#line 2818 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp66_ = selection_has_videos;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp66_) {
-#line 2790 "CollectionPage.c"
+#line 2826 "CollectionPage.c"
 		gboolean _tmp67_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp67_ = has_selected;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = _tmp67_;
-#line 2796 "CollectionPage.c"
+#line 2832 "CollectionPage.c"
 	} else {
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = FALSE;
-#line 2800 "CollectionPage.c"
+#line 2836 "CollectionPage.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp65_) {
-#line 2804 "CollectionPage.c"
+#line 2840 "CollectionPage.c"
 		gboolean _tmp68_ = FALSE;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = _tmp68_;
-#line 2810 "CollectionPage.c"
+#line 2846 "CollectionPage.c"
 	} else {
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 2814 "CollectionPage.c"
+#line 2850 "CollectionPage.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_);
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp70_ = selection_has_videos;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp70_) {
-#line 2822 "CollectionPage.c"
+#line 2858 "CollectionPage.c"
 		gboolean _tmp71_ = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp71_ = has_selected;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = _tmp71_;
-#line 2828 "CollectionPage.c"
+#line 2864 "CollectionPage.c"
 	} else {
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = FALSE;
-#line 2832 "CollectionPage.c"
+#line 2868 "CollectionPage.c"
 	}
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_);
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp73_ = selection_has_videos;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp73_) {
-#line 2840 "CollectionPage.c"
+#line 2876 "CollectionPage.c"
 		gboolean _tmp74_ = FALSE;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp74_ = has_selected;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = _tmp74_;
-#line 2846 "CollectionPage.c"
+#line 2882 "CollectionPage.c"
 	} else {
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = FALSE;
-#line 2850 "CollectionPage.c"
+#line 2886 "CollectionPage.c"
 	}
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp76_ = selection_has_videos;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp76_) {
-#line 2858 "CollectionPage.c"
+#line 2894 "CollectionPage.c"
 		gboolean _tmp77_ = FALSE;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp77_ = has_selected;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = _tmp77_;
-#line 2864 "CollectionPage.c"
+#line 2900 "CollectionPage.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = FALSE;
-#line 2868 "CollectionPage.c"
+#line 2904 "CollectionPage.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_);
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp79_ = selection_has_videos;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp79_) {
-#line 2876 "CollectionPage.c"
+#line 2912 "CollectionPage.c"
 		gboolean _tmp80_ = FALSE;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp80_ = has_selected;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = _tmp80_;
-#line 2882 "CollectionPage.c"
+#line 2918 "CollectionPage.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = FALSE;
-#line 2886 "CollectionPage.c"
+#line 2922 "CollectionPage.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = has_selected;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp81_);
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = has_selected;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp82_);
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = has_selected;
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp83_);
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = one_selected;
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp84_);
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = page_has_photos;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp86_) {
-#line 2910 "CollectionPage.c"
+#line 2946 "CollectionPage.c"
 		gboolean _tmp87_ = FALSE;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp87_ = primary_is_video;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = !_tmp87_;
-#line 2916 "CollectionPage.c"
+#line 2952 "CollectionPage.c"
 	} else {
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = FALSE;
-#line 2920 "CollectionPage.c"
+#line 2956 "CollectionPage.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_);
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = selection_has_videos;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp89_) {
-#line 2928 "CollectionPage.c"
+#line 2964 "CollectionPage.c"
 		gboolean _tmp90_ = FALSE;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp90_ = has_selected;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = _tmp90_;
-#line 2934 "CollectionPage.c"
+#line 2970 "CollectionPage.c"
 	} else {
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = FALSE;
-#line 2938 "CollectionPage.c"
+#line 2974 "CollectionPage.c"
 	}
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
-#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = has_selected;
-#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp91_);
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp93_ = selection_has_videos;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp93_) {
-#line 2950 "CollectionPage.c"
+#line 2986 "CollectionPage.c"
 		gboolean _tmp94_ = FALSE;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp94_ = has_selected;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = _tmp94_;
-#line 2956 "CollectionPage.c"
+#line 2992 "CollectionPage.c"
 	} else {
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = FALSE;
-#line 2960 "CollectionPage.c"
+#line 2996 "CollectionPage.c"
 	}
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_);
-#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp95_ = has_selected;
-#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp95_) {
-#line 2968 "CollectionPage.c"
+#line 3004 "CollectionPage.c"
 		const gchar* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gchar* label = NULL;
 		gchar* _tmp98_ = NULL;
 		const gchar* _tmp99_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		g_debug ("CollectionPage.vala:278: Setting action label for SetBackground...");
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		g_debug ("CollectionPage.vala:284: Setting action label for SetBackground...");
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp97_ = one_selected;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp97_) {
-#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 2982 "CollectionPage.c"
+#line 3018 "CollectionPage.c"
 		} else {
-#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 2986 "CollectionPage.c"
+#line 3022 "CollectionPage.c"
 		}
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp98_ = g_strdup (_tmp96_);
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		label = _tmp98_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp99_ = label;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_);
-#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (label);
-#line 2998 "CollectionPage.c"
+#line 3034 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3008 "CollectionPage.c"
+#line 3044 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -3013,25 +3049,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 3035 "CollectionPage.c"
+#line 3071 "CollectionPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3051,120 +3087,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_ = FALSE;
 			LibraryPhoto* _tmp25_ = NULL;
 			gboolean _tmp26_ = FALSE;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3063 "CollectionPage.c"
+#line 3099 "CollectionPage.c"
 			}
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3085 "CollectionPage.c"
+#line 3121 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
 				gpointer _tmp17_ = NULL;
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3106 "CollectionPage.c"
+#line 3142 "CollectionPage.c"
 			}
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3116 "CollectionPage.c"
+#line 3152 "CollectionPage.c"
 			}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3128 "CollectionPage.c"
+#line 3164 "CollectionPage.c"
 			}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3144 "CollectionPage.c"
+#line 3180 "CollectionPage.c"
 			}
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3164 "CollectionPage.c"
+#line 3200 "CollectionPage.c"
 		}
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3168 "CollectionPage.c"
+#line 3204 "CollectionPage.c"
 	}
 }
 
@@ -3174,48 +3210,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3192 "CollectionPage.c"
+#line 3228 "CollectionPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3219 "CollectionPage.c"
+#line 3255 "CollectionPage.c"
 	}
 }
 
@@ -3228,52 +3264,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 321 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3250 "CollectionPage.c"
+#line 3286 "CollectionPage.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/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 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3269 "CollectionPage.c"
+#line 3305 "CollectionPage.c"
 	} else {
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3273 "CollectionPage.c"
+#line 3309 "CollectionPage.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3277 "CollectionPage.c"
+#line 3313 "CollectionPage.c"
 }
 
 
@@ -3295,162 +3331,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
 	CheckerboardPageActivator _tmp13_ = 0;
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3329 "CollectionPage.c"
+#line 3365 "CollectionPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3341 "CollectionPage.c"
+#line 3377 "CollectionPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3355 "CollectionPage.c"
+#line 3391 "CollectionPage.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:344: activating %s", _tmp12_);
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_debug ("CollectionPage.vala:350: activating %s", _tmp12_);
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (_tmp12_);
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3371 "CollectionPage.c"
+#line 3407 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
 		gboolean _tmp15_ = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3382 "CollectionPage.c"
+#line 3418 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_ = NULL;
 			LibraryWindow* _tmp17_ = NULL;
 			LibraryPhoto* _tmp18_ = NULL;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/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 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3397 "CollectionPage.c"
+#line 3433 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3405 "CollectionPage.c"
+#line 3441 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
 			gboolean _tmp22_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3415 "CollectionPage.c"
+#line 3451 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
 				gboolean _tmp24_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3424 "CollectionPage.c"
+#line 3460 "CollectionPage.c"
 			} else {
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3428 "CollectionPage.c"
+#line 3464 "CollectionPage.c"
 			}
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3432 "CollectionPage.c"
+#line 3468 "CollectionPage.c"
 				LibraryWindow* _tmp25_ = NULL;
 				LibraryWindow* _tmp26_ = NULL;
 				LibraryPhoto* _tmp27_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/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 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3446 "CollectionPage.c"
+#line 3482 "CollectionPage.c"
 			}
 		}
 	}
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3454 "CollectionPage.c"
+#line 3490 "CollectionPage.c"
 }
 
 
@@ -3463,133 +3499,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 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3487 "CollectionPage.c"
+#line 3523 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/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 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3510 "CollectionPage.c"
+#line 3546 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/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 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3521 "CollectionPage.c"
+#line 3557 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3527 "CollectionPage.c"
+#line 3563 "CollectionPage.c"
 			default:
 			{
-#line 372 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3534 "CollectionPage.c"
+#line 3570 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3540 "CollectionPage.c"
+#line 3576 "CollectionPage.c"
 			default:
 			{
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3547 "CollectionPage.c"
+#line 3583 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3553 "CollectionPage.c"
+#line 3589 "CollectionPage.c"
 			default:
 			{
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3560 "CollectionPage.c"
+#line 3596 "CollectionPage.c"
 			}
 		}
 	}
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3570 "CollectionPage.c"
+#line 3606 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_);
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3580 "CollectionPage.c"
+#line 3616 "CollectionPage.c"
 	}
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3586 "CollectionPage.c"
+#line 3622 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3593 "CollectionPage.c"
+#line 3629 "CollectionPage.c"
 }
 
 
@@ -3645,233 +3681,233 @@ static void collection_page_real_on_export (MediaPage* base) {
 	ExporterUI* _tmp90_ = NULL;
 	ExporterUI* _tmp91_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3657 "CollectionPage.c"
+#line 3693 "CollectionPage.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3683 "CollectionPage.c"
+#line 3719 "CollectionPage.c"
 	}
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3699 "CollectionPage.c"
+#line 3735 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3706 "CollectionPage.c"
+#line 3742 "CollectionPage.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3714 "CollectionPage.c"
+#line 3750 "CollectionPage.c"
 		GeeCollection* _tmp14_ = NULL;
 		ExporterUI* _tmp15_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/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 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3729 "CollectionPage.c"
+#line 3765 "CollectionPage.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3737 "CollectionPage.c"
+#line 3773 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
 		GeeCollection* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gchar* _tmp23_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 3751 "CollectionPage.c"
+#line 3787 "CollectionPage.c"
 			const gchar* _tmp21_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = _ ("Export Photo/Video");
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp21_;
-#line 3757 "CollectionPage.c"
+#line 3793 "CollectionPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _ ("Export Photos/Videos");
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp22_;
-#line 3764 "CollectionPage.c"
+#line 3800 "CollectionPage.c"
 		}
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = g_strdup (_tmp17_);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp23_;
-#line 3772 "CollectionPage.c"
+#line 3808 "CollectionPage.c"
 	} else {
 		const gchar* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gchar* _tmp30_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = export_list;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = _tmp26_;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp27_ == 1) {
-#line 3787 "CollectionPage.c"
+#line 3823 "CollectionPage.c"
 			const gchar* _tmp28_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp28_ = _ ("Export Photo");
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp28_;
-#line 3793 "CollectionPage.c"
+#line 3829 "CollectionPage.c"
 		} else {
 			const gchar* _tmp29_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp29_ = _ ("Export Photos");
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp29_;
-#line 3800 "CollectionPage.c"
+#line 3836 "CollectionPage.c"
 		}
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = g_strdup (_tmp24_);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp30_;
-#line 3808 "CollectionPage.c"
+#line 3844 "CollectionPage.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = title;
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = export_dialog_new (_tmp31_);
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp32_);
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dialog = _tmp32_;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = has_some_videos;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp34_) {
-#line 3822 "CollectionPage.c"
+#line 3858 "CollectionPage.c"
 		ExportFormatParameters _tmp35_ = {0};
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_current (&_tmp35_);
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp35_;
-#line 3828 "CollectionPage.c"
+#line 3864 "CollectionPage.c"
 	} else {
 		ExportFormatParameters _tmp36_ = {0};
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_last (&_tmp36_);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp36_;
-#line 3835 "CollectionPage.c"
+#line 3871 "CollectionPage.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_params = _tmp33_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = export_dialog;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scale = _tmp38_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	constraint = _tmp39_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp40_) {
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3857 "CollectionPage.c"
+#line 3893 "CollectionPage.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp41_ = constraint;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp42_ = scale;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling = _tmp43_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp44_ = export_list;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp45_ = gee_collection_get_size (_tmp44_);
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp46_ = _tmp45_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp46_ == 1) {
-#line 3875 "CollectionPage.c"
+#line 3911 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
 		LibraryPhoto* _tmp55_ = NULL;
@@ -3881,22 +3917,22 @@ static void collection_page_real_on_export (MediaPage* base) {
 		GFile* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		GFile* _tmp61_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3887 "CollectionPage.c"
+#line 3923 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
 			GeeCollection* _tmp47_ = NULL;
 			GeeIterator* _tmp48_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp47_ = export_list;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_p_it = _tmp48_;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3900 "CollectionPage.c"
+#line 3936 "CollectionPage.c"
 				GeeIterator* _tmp49_ = NULL;
 				gboolean _tmp50_ = FALSE;
 				LibraryPhoto* p = NULL;
@@ -3904,73 +3940,73 @@ static void collection_page_real_on_export (MediaPage* base) {
 				gpointer _tmp52_ = NULL;
 				LibraryPhoto* _tmp53_ = NULL;
 				LibraryPhoto* _tmp54_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp49_ = _p_it;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp50_ = gee_iterator_next (_tmp49_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!_tmp50_) {
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3916 "CollectionPage.c"
+#line 3952 "CollectionPage.c"
 				}
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp51_ = _p_it;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp52_ = gee_iterator_get (_tmp51_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				p = (LibraryPhoto*) _tmp52_;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp53_ = p;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp54_ = _g_object_ref0 (_tmp53_);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo = _tmp54_;
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3936 "CollectionPage.c"
+#line 3972 "CollectionPage.c"
 			}
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3940 "CollectionPage.c"
+#line 3976 "CollectionPage.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp55_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = export_ui_choose_file (_tmp58_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp58_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		save_as = _tmp60_;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = save_as;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp61_ == NULL) {
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 3974 "CollectionPage.c"
+#line 4010 "CollectionPage.c"
 		}
 		{
 			AppWindow* _tmp62_ = NULL;
@@ -3989,191 +4025,191 @@ static void collection_page_real_on_export (MediaPage* base) {
 			gboolean _tmp75_ = FALSE;
 			AppWindow* _tmp76_ = NULL;
 			AppWindow* _tmp77_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp62_ = app_window_get_instance ();
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp63_ = _tmp62_;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp63_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp64_ = photo;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp65_ = save_as;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = scaling;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp67_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = _tmp67_.quality;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp69_ = photo;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp70_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp72_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp73_ = _tmp72_.mode;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp74_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp75_ = _tmp74_.export_metadata;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4029 "CollectionPage.c"
-				goto __catch232_g_error;
+#line 4065 "CollectionPage.c"
+				goto __catch233_g_error;
 			}
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp77_ = _tmp76_;
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp77_);
-#line 4040 "CollectionPage.c"
+#line 4076 "CollectionPage.c"
 		}
-		goto __finally232;
-		__catch232_g_error:
+		goto __finally233;
+		__catch233_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp78_ = NULL;
 			AppWindow* _tmp79_ = NULL;
 			GFile* _tmp80_ = NULL;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp78_ = app_window_get_instance ();
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp79_ = _tmp78_;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp79_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp80_ = save_as;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			export_error_dialog (_tmp80_, FALSE);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4067 "CollectionPage.c"
+#line 4103 "CollectionPage.c"
 		}
-		__finally232:
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		__finally233:
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/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 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4088 "CollectionPage.c"
+#line 4124 "CollectionPage.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4102 "CollectionPage.c"
+#line 4138 "CollectionPage.c"
 	}
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = title;
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = export_ui_choose_dir (_tmp81_);
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dir = _tmp82_;
-#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = export_dir;
-#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp83_ == NULL) {
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4124 "CollectionPage.c"
+#line 4160 "CollectionPage.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = export_list;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp85_ = export_dir;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = scaling;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp87_ = export_params;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = _tmp88_;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp90_ = exporter_ui_new (_tmp89_);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = _tmp90_;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp89_);
-#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = self->priv->exporter;
-#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4158 "CollectionPage.c"
+#line 4194 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4169 "CollectionPage.c"
+#line 4205 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4177 "CollectionPage.c"
+#line 4213 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4185,31 +4221,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4213 "CollectionPage.c"
+#line 4249 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4222,107 +4258,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4238 "CollectionPage.c"
+#line 4274 "CollectionPage.c"
 			}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4258 "CollectionPage.c"
+#line 4294 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4270 "CollectionPage.c"
+#line 4306 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_ = NULL;
 					gboolean _tmp21_ = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4280 "CollectionPage.c"
+#line 4316 "CollectionPage.c"
 				}
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4284 "CollectionPage.c"
+#line 4320 "CollectionPage.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4288 "CollectionPage.c"
+#line 4324 "CollectionPage.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4302 "CollectionPage.c"
+#line 4338 "CollectionPage.c"
 			}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4308 "CollectionPage.c"
+#line 4344 "CollectionPage.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4312 "CollectionPage.c"
+#line 4348 "CollectionPage.c"
 	}
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4318 "CollectionPage.c"
+#line 4354 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4326 "CollectionPage.c"
+#line 4362 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4334,31 +4370,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4362 "CollectionPage.c"
+#line 4398 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4371,82 +4407,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4387 "CollectionPage.c"
+#line 4423 "CollectionPage.c"
 			}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4407 "CollectionPage.c"
+#line 4443 "CollectionPage.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4416 "CollectionPage.c"
+#line 4452 "CollectionPage.c"
 			} else {
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4420 "CollectionPage.c"
+#line 4456 "CollectionPage.c"
 			}
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4434 "CollectionPage.c"
+#line 4470 "CollectionPage.c"
 			}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4440 "CollectionPage.c"
+#line 4476 "CollectionPage.c"
 		}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4444 "CollectionPage.c"
+#line 4480 "CollectionPage.c"
 	}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4450 "CollectionPage.c"
+#line 4486 "CollectionPage.c"
 }
 
 
@@ -4467,59 +4503,59 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4487 "CollectionPage.c"
+#line 4523 "CollectionPage.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4523 "CollectionPage.c"
+#line 4559 "CollectionPage.c"
 }
 
 
@@ -4528,40 +4564,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4546 "CollectionPage.c"
+#line 4582 "CollectionPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4565 "CollectionPage.c"
+#line 4601 "CollectionPage.c"
 	}
 }
 
@@ -4583,59 +4619,59 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4603 "CollectionPage.c"
+#line 4639 "CollectionPage.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4639 "CollectionPage.c"
+#line 4675 "CollectionPage.c"
 }
 
 
@@ -4656,59 +4692,59 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4676 "CollectionPage.c"
+#line 4712 "CollectionPage.c"
 	}
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Horizontally");
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4712 "CollectionPage.c"
+#line 4748 "CollectionPage.c"
 }
 
 
@@ -4729,59 +4765,59 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4749 "CollectionPage.c"
+#line 4785 "CollectionPage.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Vertically");
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Vertically");
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4785 "CollectionPage.c"
+#line 4821 "CollectionPage.c"
 }
 
 
@@ -4801,29 +4837,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_ = NULL;
 	CommandManager* _tmp34_ = NULL;
 	RevertMultipleCommand* _tmp35_ = NULL;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4821 "CollectionPage.c"
+#line 4857 "CollectionPage.c"
 	}
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4827 "CollectionPage.c"
+#line 4863 "CollectionPage.c"
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -4832,33 +4868,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4862 "CollectionPage.c"
+#line 4898 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -4871,31 +4907,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gint _object_index = 0;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4899 "CollectionPage.c"
+#line 4935 "CollectionPage.c"
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -4904,72 +4940,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_ = 0;
 				gpointer _tmp25_ = NULL;
 				DataObject* _tmp26_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4920 "CollectionPage.c"
+#line 4956 "CollectionPage.c"
 				}
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4936 "CollectionPage.c"
+#line 4972 "CollectionPage.c"
 			}
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4940 "CollectionPage.c"
+#line 4976 "CollectionPage.c"
 		}
 	}
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4973 "CollectionPage.c"
+#line 5009 "CollectionPage.c"
 }
 
 
@@ -4988,57 +5024,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
 	PixelTransformationBundle* _tmp12_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5008 "CollectionPage.c"
+#line 5044 "CollectionPage.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5042 "CollectionPage.c"
+#line 5078 "CollectionPage.c"
 }
 
 
@@ -5061,78 +5097,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_ = NULL;
 	CommandManager* _tmp15_ = NULL;
 	AdjustColorsMultipleCommand* _tmp16_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5085 "CollectionPage.c"
+#line 5121 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5092 "CollectionPage.c"
+#line 5128 "CollectionPage.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5100 "CollectionPage.c"
+#line 5136 "CollectionPage.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/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 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5136 "CollectionPage.c"
+#line 5172 "CollectionPage.c"
 }
 
 
@@ -5151,55 +5187,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	EnhanceMultipleCommand* _tmp12_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5171 "CollectionPage.c"
+#line 5207 "CollectionPage.c"
 	}
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5203 "CollectionPage.c"
+#line 5239 "CollectionPage.c"
 }
 
 
@@ -5218,55 +5254,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5238 "CollectionPage.c"
+#line 5274 "CollectionPage.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5270 "CollectionPage.c"
+#line 5306 "CollectionPage.c"
 }
 
 
@@ -5301,29 +5337,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5321 "CollectionPage.c"
+#line 5357 "CollectionPage.c"
 	}
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5327 "CollectionPage.c"
+#line 5363 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -5335,31 +5371,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _dv_index = 0;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5363 "CollectionPage.c"
+#line 5399 "CollectionPage.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5371,109 +5407,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_ = NULL;
 			DataSource* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5387 "CollectionPage.c"
+#line 5423 "CollectionPage.c"
 			}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5411 "CollectionPage.c"
+#line 5447 "CollectionPage.c"
 			} else {
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5415 "CollectionPage.c"
+#line 5451 "CollectionPage.c"
 			}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5419 "CollectionPage.c"
+#line 5455 "CollectionPage.c"
 		}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5423 "CollectionPage.c"
+#line 5459 "CollectionPage.c"
 	}
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5477 "CollectionPage.c"
+#line 5513 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
@@ -5487,49 +5523,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_ = NULL;
 		CommandManager* _tmp50_ = NULL;
 		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/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 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5527 "CollectionPage.c"
+#line 5563 "CollectionPage.c"
 	}
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5533 "CollectionPage.c"
+#line 5569 "CollectionPage.c"
 }
 
 
@@ -5546,122 +5582,122 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_ = NULL;
 	Photo* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5566 "CollectionPage.c"
+#line 5602 "CollectionPage.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5586 "CollectionPage.c"
+#line 5622 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		AppWindow* _tmp13_ = NULL;
 		AppWindow* _tmp14_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5607 "CollectionPage.c"
-			goto __catch233_g_error;
+#line 5643 "CollectionPage.c"
+			goto __catch234_g_error;
 		}
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5618 "CollectionPage.c"
+#line 5654 "CollectionPage.c"
 	}
-	goto __finally233;
-	__catch233_g_error:
+	goto __finally234;
+	__catch234_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5648 "CollectionPage.c"
+#line 5684 "CollectionPage.c"
 	}
-	__finally233:
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally234:
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/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 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5661 "CollectionPage.c"
+#line 5697 "CollectionPage.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5665 "CollectionPage.c"
+#line 5701 "CollectionPage.c"
 }
 
 
@@ -5680,53 +5716,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PhotoFileFormat _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5700 "CollectionPage.c"
+#line 5736 "CollectionPage.c"
 	}
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5730 "CollectionPage.c"
+#line 5766 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_ = NULL;
@@ -5734,35 +5770,35 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_ = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5752 "CollectionPage.c"
-			goto __catch234_g_error;
+#line 5788 "CollectionPage.c"
+			goto __catch235_g_error;
 		}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5763 "CollectionPage.c"
+#line 5799 "CollectionPage.c"
 	}
-	goto __finally234;
-	__catch234_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_ = NULL;
@@ -5770,48 +5806,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5798 "CollectionPage.c"
+#line 5834 "CollectionPage.c"
 	}
-	__finally234:
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally235:
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/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 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5811 "CollectionPage.c"
+#line 5847 "CollectionPage.c"
 	}
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5815 "CollectionPage.c"
+#line 5851 "CollectionPage.c"
 }
 
 
@@ -5828,60 +5864,60 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/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 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5862 "CollectionPage.c"
+#line 5898 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_ = NULL;
 		SetBackgroundPhotoDialog* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_object_ref_sink (_tmp9_);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5885 "CollectionPage.c"
+#line 5921 "CollectionPage.c"
 			AppWindow* _tmp14_ = NULL;
 			AppWindow* _tmp15_ = NULL;
 			GeeArrayList* _tmp16_ = NULL;
@@ -5891,54 +5927,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_ = FALSE;
 			AppWindow* _tmp21_ = NULL;
 			AppWindow* _tmp22_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/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 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5925 "CollectionPage.c"
+#line 5961 "CollectionPage.c"
 		}
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (dialog);
-#line 5929 "CollectionPage.c"
+#line 5965 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5942 "CollectionPage.c"
+#line 5978 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
 			gint delay = 0;
@@ -5947,25 +5983,25 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_object_ref_sink (_tmp26_);
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 5969 "CollectionPage.c"
+#line 6005 "CollectionPage.c"
 				AppWindow* _tmp32_ = NULL;
 				AppWindow* _tmp33_ = NULL;
 				GeeArrayList* _tmp34_ = NULL;
@@ -5974,42 +6010,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_ = FALSE;
 				AppWindow* _tmp38_ = NULL;
 				AppWindow* _tmp39_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/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 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 6004 "CollectionPage.c"
+#line 6040 "CollectionPage.c"
 			}
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dialog);
-#line 6008 "CollectionPage.c"
+#line 6044 "CollectionPage.c"
 		}
 	}
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 6013 "CollectionPage.c"
+#line 6049 "CollectionPage.c"
 }
 
 
@@ -6049,205 +6085,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_ = NULL;
 	SlideshowPage* _tmp39_ = NULL;
 	SlideshowPage* _tmp40_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6069 "CollectionPage.c"
+#line 6105 "CollectionPage.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6083 "CollectionPage.c"
+#line 6119 "CollectionPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		GeeList* _tmp11_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6099 "CollectionPage.c"
+#line 6135 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		GeeList* _tmp14_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6116 "CollectionPage.c"
+#line 6152 "CollectionPage.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6128 "CollectionPage.c"
+#line 6164 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6141 "CollectionPage.c"
+#line 6177 "CollectionPage.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6151 "CollectionPage.c"
+#line 6187 "CollectionPage.c"
 	}
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6185 "CollectionPage.c"
+#line 6221 "CollectionPage.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6197 "CollectionPage.c"
+#line 6233 "CollectionPage.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6215 "CollectionPage.c"
+#line 6251 "CollectionPage.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/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 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6251 "CollectionPage.c"
+#line 6287 "CollectionPage.c"
 }
 
 
@@ -6261,49 +6297,49 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/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 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6279 "CollectionPage.c"
+#line 6315 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/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 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 6295 "CollectionPage.c"
+#line 6331 "CollectionPage.c"
 	}
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/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 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6307 "CollectionPage.c"
+#line 6343 "CollectionPage.c"
 }
 
 
@@ -6317,56 +6353,56 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/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 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6335 "CollectionPage.c"
+#line 6371 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/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 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 6351 "CollectionPage.c"
+#line 6387 "CollectionPage.c"
 	}
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/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 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6363 "CollectionPage.c"
+#line 6399 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6370 "CollectionPage.c"
+#line 6406 "CollectionPage.c"
 }
 
 
@@ -6375,17 +6411,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6389 "CollectionPage.c"
+#line 6425 "CollectionPage.c"
 }
 
 
@@ -6398,7 +6434,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 6402 "CollectionPage.c"
+#line 6438 "CollectionPage.c"
 }
 
 
@@ -6408,14 +6444,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 6412 "CollectionPage.c"
+#line 6448 "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 6419 "CollectionPage.c"
+#line 6455 "CollectionPage.c"
 }
 
 
@@ -6424,7 +6460,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 6428 "CollectionPage.c"
+#line 6464 "CollectionPage.c"
 }
 
 
@@ -6477,7 +6513,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 6481 "CollectionPage.c"
+#line 6517 "CollectionPage.c"
 }
 
 
@@ -6491,7 +6527,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 6495 "CollectionPage.c"
+#line 6531 "CollectionPage.c"
 }
 
 
@@ -6505,7 +6541,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 6509 "CollectionPage.c"
+#line 6545 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index df39f64..3434b13 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -63,6 +63,12 @@ public abstract class CollectionPage : MediaPage {
             MediaPage.ZoomSliderAssembly zoom_slider_assembly = create_zoom_slider_assembly();
             connect_slider(zoom_slider_assembly);
             get_toolbar().insert(zoom_slider_assembly, -1);
+
+            Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+            unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class(rotate_button.get_class());
+            Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.KP_Space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+            Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+
         }
         
         return toolbar;
diff --git a/src/Commands.c b/src/Commands.c
index 704c577..e07a9de 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -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 __catch455_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 __finally455;
+	__catch455_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:
+	__finally455:
 	{
 		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 __catch456_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 __finally456;
+	__catch456_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:
+	__finally456:
 	{
 		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 __catch457_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 __finally457;
+	__catch457_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:
+	__finally457:
 #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 __catch458_g_error;
 			}
 		}
-		goto __finally457;
-		__catch457_g_error:
+		goto __finally458;
+		__catch458_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:
+		__finally458:
 #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 __catch459_g_error;
 			}
 		}
-		goto __finally458;
-		__catch458_g_error:
+		goto __finally459;
+		__catch459_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:
+		__finally459:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14608,7 +14608,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14611 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch460_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -14633,7 +14633,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14636 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch460_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -14659,8 +14659,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 14661 "Commands.c"
 	}
-	goto __finally459;
-	__catch459_g_regex_error:
+	goto __finally460;
+	__catch460_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -14673,7 +14673,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 14675 "Commands.c"
 	}
-	__finally459:
+	__finally460:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/Debug.c b/src/Debug.c
index 3edfcd9..0b2c7f4 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -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 __catch432_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 __finally432;
+		__catch432_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:
+		__finally432:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index 0c25115..2edfc90 100644
--- a/src/DesktopIntegration.c
+++ b/src/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 __catch566_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 __finally566;
+	__catch566_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:
+	__finally566:
 #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 __catch567_g_error;
 		}
 	}
-	goto __finally565;
-	__catch565_g_error:
+	goto __finally567;
+	__catch567_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:
+	__finally567:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/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 __catch568_g_error;
 		}
 	}
-	goto __finally566;
-	__catch566_g_error:
+	goto __finally568;
+	__catch568_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:
+	__finally568:
 #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 __catch569_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 __catch569_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 __catch569_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 __finally569;
+	__catch569_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:
+	__finally569:
 #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 fdd6e47..6ebebf4 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -8921,7 +8921,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8909 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
@@ -8940,7 +8940,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8928 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
@@ -8951,14 +8951,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8939 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
 #line 8944 "Dialogs.c"
 		}
-		goto __finally423;
-		__catch423_g_error:
+		goto __finally424;
+		__catch424_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_ = NULL;
@@ -8988,7 +8988,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_error_free0 (err);
 #line 8975 "Dialogs.c"
 		}
-		__finally423:
+		__finally424:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14259,7 +14259,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14247 "Dialogs.c"
-			goto __catch424_g_error;
+			goto __catch425_g_error;
 		}
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
@@ -14273,8 +14273,8 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_object_unref0 (_tmp113_);
 #line 14260 "Dialogs.c"
 	}
-	goto __finally424;
-	__catch424_g_error:
+	goto __finally425;
+	__catch425_g_error:
 	{
 		GError* err = NULL;
 		Dateable* _tmp117_ = NULL;
@@ -14298,7 +14298,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_error_free0 (err);
 #line 14285 "Dialogs.c"
 	}
-	__finally424:
+	__finally425:
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17580,7 +17580,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17566 "Dialogs.c"
-			goto __catch425_g_error;
+			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
@@ -17593,7 +17593,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
 #line 17579 "Dialogs.c"
-			goto __catch425_g_error;
+			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
@@ -17617,8 +17617,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17602 "Dialogs.c"
 	}
-	goto __finally425;
-	__catch425_g_error:
+	goto __finally426;
+	__catch426_g_error:
 	{
 		GError* e = NULL;
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17635,7 +17635,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17620 "Dialogs.c"
 	}
-	__finally425:
+	__finally426:
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18527,11 +18527,11 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18513 "Dialogs.c"
-			goto __catch426_g_error;
+			goto __catch427_g_error;
 		}
 	}
-	goto __finally426;
-	__catch426_g_error:
+	goto __finally427;
+	__catch427_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -18550,7 +18550,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		_g_error_free0 (e);
 #line 18535 "Dialogs.c"
 	}
-	__finally426:
+	__finally427:
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18791,7 +18791,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18777 "Dialogs.c"
-						goto __catch427_g_error;
+						goto __catch428_g_error;
 					}
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
@@ -18843,7 +18843,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18829 "Dialogs.c"
-							goto __catch427_g_error;
+							goto __catch428_g_error;
 						}
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
@@ -18865,8 +18865,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					}
 				}
 			}
-			goto __finally427;
-			__catch427_g_error:
+			goto __finally428;
+			__catch428_g_error:
 			{
 				GError* _error_ = NULL;
 				GError* _tmp52_ = NULL;
@@ -18893,7 +18893,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				_g_error_free0 (_error_);
 #line 18878 "Dialogs.c"
 			}
-			__finally427:
+			__finally428:
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index b99f323..2762dfe 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -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 __catch480_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 __finally480;
+		__catch480_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:
+		__finally480:
 #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 __catch481_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 __catch481_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -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 __finally481;
+	__catch481_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:
+	__finally481:
 #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 __catch482_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 __finally482;
+	__catch482_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:
+	__finally482:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -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 __catch483_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 __finally483;
+	__catch483_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:
+	__finally483:
 #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 __catch484_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 __finally484;
+	__catch484_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:
+	__finally484:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
diff --git a/src/Event.c b/src/Event.c
index 3544857..af882ab 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -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 __catch435_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 __finally435;
+	__catch435_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:
+	__finally435:
 #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 __catch436_g_error;
 		}
 	}
-	goto __finally435;
-	__catch435_g_error:
+	goto __finally436;
+	__catch436_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:
+	__finally436:
 #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 __catch437_g_error;
 		}
 	}
-	goto __finally436;
-	__catch436_g_error:
+	goto __finally437;
+	__catch437_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:
+	__finally437:
 #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 __catch438_g_error;
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally438;
+	__catch438_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:
+	__finally438:
 #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 __catch439_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally439;
+	__catch439_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:
+	__finally439:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -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 __catch440_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 __finally440;
+	__catch440_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:
+	__finally440:
 #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 __catch441_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 __finally441;
+	__catch441_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:
+	__finally441:
 #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 __catch442_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 __finally442;
+	__catch442_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:
+	__finally442:
 #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 3f7a625..bc4c3b1 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -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 __catch478_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 __finally478;
+				__catch478_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:
+				__finally478:
 #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 __catch479_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 __catch479_g_error;
 				}
 			}
 		}
 	}
-	goto __finally478;
-	__catch478_g_error:
+	goto __finally479;
+	__catch479_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:
+	__finally479:
 #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/LibraryFiles.c b/src/LibraryFiles.c
index 48f84e9..12b77b8 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -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 __catch462_g_error;
 		}
 	}
-	goto __finally461;
-	__catch461_g_error:
+	goto __finally462;
+	__catch462_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 __finally462;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally461:
+	__finally462:
 #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 __catch463_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally462;
-	__catch462_g_error:
+	goto __finally463;
+	__catch463_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:
+	__finally463:
 #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 __catch464_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 __finally464;
+		__catch464_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:
+		__finally464:
 #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 __catch465_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 __finally465;
+		__catch465_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:
+		__finally465:
 #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 __catch466_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 __finally466;
+	__catch466_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 __finally466;
 			}
 #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 __finally466;
 			}
 #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:
+	__finally466:
 #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 __catch467_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 __catch467_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 __finally467;
+	__catch467_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:
+	__finally467:
 #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 ea83be6..8f36753 100644
--- a/src/LibraryMonitor.c
+++ b/src/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 __catch485_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 __finally485;
+					__catch485_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:
+					__finally485:
 #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 __catch486_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 __finally486;
+		__catch486_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:
+		__finally486:
 #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:
+		__finally487:
 		{
 			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:
+		__finally488:
 		{
 			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:
+		__finally489:
 		{
 			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:
+		__finally490:
 		{
 			GeeHashSet* _tmp5_ = NULL;
 #line 754 "/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 __catch491_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 __finally491;
+	__catch491_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:
+	__finally491:
 #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 __catch492_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 __finally492;
+	__catch492_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:
+	__finally492:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 30783d9..f122b3e 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -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 __catch561_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally559;
-	__catch559_g_error:
+	goto __finally561;
+	__catch561_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:
+	__finally561:
 #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 __catch562_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 __finally562;
+			__catch562_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:
+			__finally562:
 #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 __catch563_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 __finally563;
+			__catch563_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:
+			__finally563:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -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 __catch564_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 __finally564;
+		__catch564_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:
+		__finally564:
 #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 __catch565_g_error;
 				}
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally565;
+			__catch565_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:
+			__finally565:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index c81acbf..a755c56 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -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 __catch572_g_error;
 				}
 			}
-			goto __finally570;
-			__catch570_g_error:
+			goto __finally572;
+			__catch572_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:
+			__finally572:
 #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:
+		__finally571:
 		{
 			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 __catch574_g_error;
 				}
 			}
-			goto __finally572;
-			__catch572_g_error:
+			goto __finally574;
+			__catch574_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:
+			__finally574:
 #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:
+		__finally573:
 		{
 			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:
+		__finally570:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index f741331..f723c0f 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -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 __catch583_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 __finally583;
+		__catch583_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:
+		__finally583:
 #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 90f8ac6..b62ca6f 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -4068,11 +4068,11 @@ void media_page_on_play_video (MediaPage* self) {
 #line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4071 "MediaPage.c"
-			goto __catch558_g_error;
+			goto __catch560_g_error;
 		}
 	}
-	goto __finally558;
-	__catch558_g_error:
+	goto __finally560;
+	__catch560_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -4102,7 +4102,7 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_error_free0 (e);
 #line 4104 "MediaPage.c"
 	}
-	__finally558:
+	__finally560:
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 46ac165..a19ad01 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -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 __catch553_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 __finally553;
+		__catch553_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:
+		__finally553:
 #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 __catch554_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 __catch554_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 __finally554;
+		__catch554_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:
+		__finally554:
 		{
 			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 __catch555_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 __finally555;
+	__catch555_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:
+	__finally555:
 #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 __catch556_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 __catch556_g_error;
 		}
 	}
-	goto __finally554;
-	__catch554_g_error:
+	goto __finally556;
+	__catch556_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:
+	__finally556:
 #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 __finally557;
 			}
 		}
-		__finally555:
+		__finally557:
 		{
 			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 __finally558;
 			}
 		}
-		__finally556:
+		__finally558:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
diff --git a/src/Page.c b/src/Page.c
index 5729233..68114ac 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -975,8 +975,6 @@ static GtkMenu* page_real_get_page_context_menu (Page* self);
 void page_switching_from (Page* self);
 static void page_real_switching_from (Page* self);
 void page_remove_actions (Page* self, GActionMap* map);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 void page_switched_to (Page* self);
 static void page_real_switched_to (Page* self);
 static void page_add_ui (Page* self);
@@ -994,6 +992,8 @@ static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
 GAction* page_get_action (Page* self, const gchar* name);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
@@ -1052,7 +1052,7 @@ static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self);
 OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
 void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority);
-GFile* resources_get_ui (const gchar* filename);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -3213,29 +3213,50 @@ GtkMenu* page_get_page_context_menu (Page* self) {
 
 
 static void page_real_switching_from (Page* self) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GActionMap* map = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp2_ = NULL;
+	const gchar* _tmp4_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp1_);
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = self->priv->toolbar_path;
+	_tmp0_ = page_get_container (self);
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_action_map_get_type ()) ? ((GActionMap*) _tmp0_) : NULL;
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ == NULL) {
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp0_);
+#line 3232 "Page.c"
+	}
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	map = _tmp1_;
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (self->toolbar);
+	_tmp2_ = map;
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
+#line 3240 "Page.c"
+		GActionMap* _tmp3_ = NULL;
+#line 274 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = map;
+#line 274 "/home/jens/Source/shotwell/src/Page.vala"
+		page_remove_actions (self, _tmp3_);
+#line 3246 "Page.c"
+	}
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = self->priv->toolbar_path;
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp4_ != NULL) {
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (self->toolbar);
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 3238 "Page.c"
+#line 3256 "Page.c"
 	}
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (map);
+#line 3260 "Page.c"
 }
 
 
@@ -3244,75 +3265,95 @@ void page_switching_from (Page* self) {
 	g_return_if_fail (IS_PAGE (self));
 #line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_from (self);
-#line 3248 "Page.c"
+#line 3269 "Page.c"
 }
 
 
 static void page_real_switched_to (Page* self) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* map = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp2_ = NULL;
 	gint selected_count = 0;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	ViewCollection* _tmp4_ = NULL;
+	ViewCollection* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
 	gint count = 0;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp8_ = NULL;
+	ViewCollection* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
-#line 278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 282 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_ui (self);
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp1_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = page_get_view (self);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = _tmp2_;
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = page_get_container (self);
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_action_map_get_type ()) ? ((GActionMap*) _tmp0_) : NULL;
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ == NULL) {
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp0_);
+#line 3300 "Page.c"
+	}
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	map = _tmp1_;
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = map;
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
+#line 3308 "Page.c"
+		GActionMap* _tmp3_ = NULL;
+#line 285 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = map;
+#line 285 "/home/jens/Source/shotwell/src/Page.vala"
+		page_add_actions (self, _tmp3_);
+#line 3314 "Page.c"
+	}
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = page_get_view (self);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp3_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	selected_count = _tmp5_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp6_ = page_get_view (self);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp6_ = view_collection_get_selected_count (_tmp5_);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp5_);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	selected_count = _tmp7_;
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = page_get_view (self);
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _tmp8_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp7_);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	count = _tmp9_;
-#line 282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp11_ = _tmp10_;
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp9_);
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	count = _tmp11_;
+#line 289 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, selected_count, count);
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, selected_count, count);
-#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 3307 "Page.c"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (map);
+#line 3348 "Page.c"
 }
 
 
 void page_switched_to (Page* self) {
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 3316 "Page.c"
+#line 3357 "Page.c"
 }
 
 
@@ -3321,70 +3362,70 @@ static void page_real_ready (Page* self) {
 
 
 void page_ready (Page* self) {
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 3329 "Page.c"
+#line 3370 "Page.c"
 }
 
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 297 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->in_view;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3344 "Page.c"
+#line 3385 "Page.c"
 }
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
 	FullscreenWindow* _tmp0_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 302 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = fsw;
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 302 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
-#line 3356 "Page.c"
+#line 3397 "Page.c"
 }
 
 
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 3365 "Page.c"
+#line 3406 "Page.c"
 }
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
 	FullscreenWindow* _tmp0_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = fsw;
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	page_switched_to (self);
-#line 3379 "Page.c"
+#line 3420 "Page.c"
 }
 
 
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 3388 "Page.c"
+#line 3429 "Page.c"
 }
 
 
@@ -3393,79 +3434,79 @@ GAction* page_get_action (Page* self, const gchar* name) {
 	GActionMap* map = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GActionMap* _tmp5_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
 	map = NULL;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) {
-#line 3407 "Page.c"
+#line 3448 "Page.c"
 		GtkWindow* _tmp1_ = NULL;
 		GActionMap* _tmp2_ = NULL;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->container;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_action_map_get_type ()) ? ((GActionMap*) _tmp1_) : NULL);
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp2_;
-#line 3418 "Page.c"
+#line 3459 "Page.c"
 	} else {
 		AppWindow* _tmp3_ = NULL;
 		GActionMap* _tmp4_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = app_window_get_instance ();
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_action_map_get_type ()) ? ((GActionMap*) _tmp3_) : NULL;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp4_ == NULL) {
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp3_);
-#line 3430 "Page.c"
+#line 3471 "Page.c"
 		}
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp4_;
-#line 3436 "Page.c"
+#line 3477 "Page.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = map;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ != NULL) {
-#line 3442 "Page.c"
+#line 3483 "Page.c"
 		GActionMap* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		GAction* _tmp8_ = NULL;
 		GAction* _tmp9_ = NULL;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = map;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = name;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = g_action_map_lookup_action (_tmp6_, _tmp7_);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		result = _tmp9_;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3461 "Page.c"
+#line 3502 "Page.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (map);
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3469 "Page.c"
+#line 3510 "Page.c"
 }
 
 
@@ -3475,92 +3516,92 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3493 "Page.c"
+#line 3534 "Page.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3501 "Page.c"
+#line 3542 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3510 "Page.c"
+#line 3551 "Page.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3514 "Page.c"
+#line 3555 "Page.c"
 }
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = important;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3531 "Page.c"
+#line 3572 "Page.c"
 }
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = visible;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3548 "Page.c"
+#line 3589 "Page.c"
 }
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
 	const gchar* _tmp0_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (short_label != NULL);
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:333: => Set action short_label called for %s", _tmp0_);
-#line 3564 "Page.c"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:340: => Set action short_label called for %s", _tmp0_);
+#line 3605 "Page.c"
 }
 
 
@@ -3573,58 +3614,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 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3591 "Page.c"
+#line 3632 "Page.c"
 	}
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3603 "Page.c"
+#line 3644 "Page.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = label;
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 3609 "Page.c"
+#line 3650 "Page.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = label;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		page_update_menu_item_label (self, _tmp5_, _tmp6_);
-#line 3618 "Page.c"
+#line 3659 "Page.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = action;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = sensitive;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	g_simple_action_set_enabled (_tmp7_, _tmp8_);
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3628 "Page.c"
+#line 3669 "Page.c"
 }
 
 
@@ -3633,31 +3674,31 @@ void page_activate_action (Page* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3651 "Page.c"
+#line 3692 "Page.c"
 		GAction* _tmp3_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		g_action_activate (_tmp3_, NULL);
-#line 3657 "Page.c"
+#line 3698 "Page.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3661 "Page.c"
+#line 3702 "Page.c"
 }
 
 
@@ -3668,53 +3709,53 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
 		result = action;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3690 "Page.c"
+#line 3731 "Page.c"
 	}
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = log_warning;
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 3696 "Page.c"
+#line 3737 "Page.c"
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = name;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:362: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:369: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp5_);
-#line 3710 "Page.c"
+#line 3751 "Page.c"
 	}
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3718 "Page.c"
+#line 3759 "Page.c"
 }
 
 
@@ -3724,72 +3765,72 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/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 375 "/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 375 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3742 "Page.c"
+#line 3783 "Page.c"
 	}
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3750 "Page.c"
+#line 3791 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3759 "Page.c"
+#line 3800 "Page.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3763 "Page.c"
+#line 3804 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
 	const gchar* _tmp0_ = NULL;
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:374: Trying to set common action label for %s", _tmp0_);
-#line 3779 "Page.c"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:381: Trying to set common action label for %s", _tmp0_);
+#line 3820 "Page.c"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:378: Setting action to important: %s", _tmp0_);
-#line 3793 "Page.c"
+#line 385 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:385: Setting action to important: %s", _tmp0_);
+#line 3834 "Page.c"
 }
 
 
@@ -3799,106 +3840,106 @@ void page_activate_common_action (Page* self, const gchar* name) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3817 "Page.c"
+#line 3858 "Page.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3825 "Page.c"
+#line 3866 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_emit_by_name (_tmp4_, "activate", NULL);
-#line 3831 "Page.c"
+#line 3872 "Page.c"
 	}
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3835 "Page.c"
+#line 3876 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3850 "Page.c"
+#line 3891 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 391 "/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 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3865 "Page.c"
+#line 3906 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3880 "Page.c"
+#line 3921 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3895 "Page.c"
+#line 3936 "Page.c"
 }
 
 
 static GVariant* _variant_new20 (gboolean value) {
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3902 "Page.c"
+#line 3943 "Page.c"
 }
 
 
@@ -3908,47 +3949,47 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3926 "Page.c"
+#line 3967 "Page.c"
 	}
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3934 "Page.c"
+#line 3975 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		GVariant* _tmp6_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = active;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _variant_new20 (_tmp5_);
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_state (_tmp4_, _tmp6_);
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 3948 "Page.c"
+#line 3989 "Page.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3952 "Page.c"
+#line 3993 "Page.c"
 }
 
 
@@ -3978,125 +4019,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_ = 0;
 	GdkModifierType _tmp15_ = 0;
 	GdkModifierType _tmp16_ = 0;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 419 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 420 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 421 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_super = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 4010 "Page.c"
+#line 4051 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 4016 "Page.c"
+#line 4057 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 4022 "Page.c"
+#line 4063 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 4028 "Page.c"
+#line 4069 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 4032 "Page.c"
+#line 4073 "Page.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 4078 "Page.c"
+#line 4119 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 4084 "Page.c"
+#line 4125 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 4090 "Page.c"
+#line 4131 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 4096 "Page.c"
+#line 4137 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4100 "Page.c"
+#line 4141 "Page.c"
 }
 
 
@@ -4122,229 +4163,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 440 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp4_) {
-#line 438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 445 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4142 "Page.c"
+#line 4183 "Page.c"
 	}
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 4148 "Page.c"
+#line 4189 "Page.c"
 		gboolean _tmp7_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 4154 "Page.c"
+#line 4195 "Page.c"
 	} else {
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 4158 "Page.c"
+#line 4199 "Page.c"
 	}
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 4164 "Page.c"
+#line 4205 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 4172 "Page.c"
+#line 4213 "Page.c"
 			gboolean _tmp10_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 4178 "Page.c"
+#line 4219 "Page.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 4182 "Page.c"
+#line 4223 "Page.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 4188 "Page.c"
+#line 4229 "Page.c"
 		}
 	}
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 4195 "Page.c"
+#line 4236 "Page.c"
 		gboolean _tmp13_ = FALSE;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 4201 "Page.c"
+#line 4242 "Page.c"
 	} else {
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 4205 "Page.c"
+#line 4246 "Page.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 4211 "Page.c"
+#line 4252 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 4219 "Page.c"
+#line 4260 "Page.c"
 			gboolean _tmp16_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 4225 "Page.c"
+#line 4266 "Page.c"
 		} else {
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 4229 "Page.c"
+#line 4270 "Page.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 4235 "Page.c"
+#line 4276 "Page.c"
 		}
 	}
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 4242 "Page.c"
+#line 4283 "Page.c"
 		gboolean _tmp19_ = FALSE;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 4248 "Page.c"
+#line 4289 "Page.c"
 	} else {
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 4252 "Page.c"
+#line 4293 "Page.c"
 	}
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 4258 "Page.c"
+#line 4299 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 4266 "Page.c"
+#line 4307 "Page.c"
 			gboolean _tmp22_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 4272 "Page.c"
+#line 4313 "Page.c"
 		} else {
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 4276 "Page.c"
+#line 4317 "Page.c"
 		}
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 4282 "Page.c"
+#line 4323 "Page.c"
 		}
 	}
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 4289 "Page.c"
+#line 4330 "Page.c"
 		gboolean _tmp25_ = FALSE;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 4295 "Page.c"
+#line 4336 "Page.c"
 	} else {
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4299 "Page.c"
+#line 4340 "Page.c"
 	}
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4305 "Page.c"
+#line 4346 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4313 "Page.c"
+#line 4354 "Page.c"
 			gboolean _tmp28_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4319 "Page.c"
+#line 4360 "Page.c"
 		} else {
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4323 "Page.c"
+#line 4364 "Page.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4329 "Page.c"
+#line 4370 "Page.c"
 		}
 	}
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4348 "Page.c"
+#line 4389 "Page.c"
 }
 
 
@@ -4354,134 +4395,134 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_ = NULL;
 	GtkContainer* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4370 "Page.c"
+#line 4411 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 		GtkContainer* _tmp8_ = NULL;
 		GtkContainer* _tmp9_ = NULL;
 		GtkWidget* _tmp10_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4383 "Page.c"
+#line 4424 "Page.c"
 		}
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4389 "Page.c"
+#line 4430 "Page.c"
 			GtkWidget* _tmp5_ = NULL;
 			PageWindow* _tmp6_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4402 "Page.c"
+#line 4443 "Page.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4416 "Page.c"
+#line 4457 "Page.c"
 	}
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4424 "Page.c"
+#line 4465 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4439 "Page.c"
+#line 4480 "Page.c"
 }
 
 
 static void page_real_add_actions (Page* self, GActionMap* map) {
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4446 "Page.c"
+#line 4487 "Page.c"
 }
 
 
 void page_add_actions (Page* self, GActionMap* map) {
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->add_actions (self, map);
-#line 4455 "Page.c"
+#line 4496 "Page.c"
 }
 
 
 static void page_real_remove_actions (Page* self, GActionMap* map) {
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4462 "Page.c"
+#line 4503 "Page.c"
 }
 
 
 void page_remove_actions (Page* self, GActionMap* map) {
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->remove_actions (self, map);
-#line 4471 "Page.c"
+#line 4512 "Page.c"
 }
 
 
 static gboolean _variant_get21 (GVariant* value) {
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_get_boolean (value);
-#line 4478 "Page.c"
+#line 4519 "Page.c"
 }
 
 
 static GVariant* _variant_new22 (gboolean value) {
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4485 "Page.c"
+#line 4526 "Page.c"
 }
 
 
@@ -4494,50 +4535,50 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
 	GAction* _tmp6_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _variant_get21 (_tmp2_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _variant_new22 (!_tmp3_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	new_state = _tmp5_;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = action;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (new_state);
-#line 4524 "Page.c"
+#line 4565 "Page.c"
 }
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_ = NULL;
 	GVariant* _tmp1_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = value;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4541 "Page.c"
+#line 4582 "Page.c"
 }
 
 
@@ -4548,36 +4589,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4570 "Page.c"
+#line 4611 "Page.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:500: No UI file specified for %s", _tmp6_);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+		g_message ("Page.vala:507: No UI file specified for %s", _tmp6_);
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 4581 "Page.c"
+#line 4622 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4588,25 +4629,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _ui_filename_index = 0;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4610 "Page.c"
+#line 4651 "Page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -4615,90 +4656,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_ = 0;
 			gpointer _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4631 "Page.c"
+#line 4672 "Page.c"
 			}
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4647 "Page.c"
+#line 4688 "Page.c"
 		}
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4651 "Page.c"
+#line 4692 "Page.c"
 	}
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4655 "Page.c"
+#line 4696 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4674 "Page.c"
+#line 4715 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4681 "Page.c"
+#line 4722 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4688 "Page.c"
+#line 4729 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4695 "Page.c"
+#line 4736 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4702 "Page.c"
+#line 4743 "Page.c"
 }
 
 
@@ -4726,87 +4767,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_ = NULL;
 	ViewCollection* _tmp19_ = NULL;
 	ViewCollection* _tmp20_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4738 "Page.c"
+#line 4779 "Page.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/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 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/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 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/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 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/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 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4810 "Page.c"
+#line 4851 "Page.c"
 }
 
 
@@ -4824,109 +4865,109 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_ = NULL;
 	ViewCollection* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4836 "Page.c"
+#line 4877 "Page.c"
 	}
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/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 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/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 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/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 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/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 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 549 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4880 "Page.c"
+#line 4921 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4887 "Page.c"
+#line 4928 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp6_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4900 "Page.c"
+#line 4941 "Page.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		OneShotScheduler* _tmp5_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4924 "Page.c"
+#line 4965 "Page.c"
 	}
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4930 "Page.c"
+#line 4971 "Page.c"
 }
 
 
@@ -4939,160 +4980,144 @@ static void page_on_update_actions_on_idle (Page* self) {
 	ViewCollection* _tmp5_ = NULL;
 	ViewCollection* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 564 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4951 "Page.c"
+#line 4992 "Page.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->in_view;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 567 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4959 "Page.c"
+#line 5000 "Page.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (self);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp4_, _tmp7_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 4979 "Page.c"
+#line 5020 "Page.c"
 }
 
 
 static void page_init_load_ui (Page* self, const gchar* ui_filename) {
-	GFile* ui_file = NULL;
+	gchar* ui_resource = NULL;
 	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
-	ui_file = _tmp1_;
-#line 4998 "Page.c"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+	ui_resource = _tmp1_;
+#line 5039 "Page.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = g_file_get_path (ui_file);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = _tmp3_;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_builder_add_from_file (_tmp2_, _tmp4_, &_inner_error_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
+		gtk_builder_add_from_resource (_tmp2_, ui_resource, &_inner_error_);
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5015 "Page.c"
-			goto __catch253_g_error;
+#line 5048 "Page.c"
+			goto __catch254_g_error;
 		}
 	}
-	goto __finally253;
-	__catch253_g_error:
+	goto __finally254;
+	__catch254_g_error:
 	{
 		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+		Application* _tmp7_ = NULL;
+		Application* _tmp8_ = NULL;
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = g_file_get_path (ui_file);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = err;
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _tmp3_->message;
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = g_strdup_printf ("Error loading UI resource %s: %s", ui_resource, _tmp4_);
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = err;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8_ = _tmp7_->message;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp6_, _tmp8_);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10_ = _tmp9_;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp10_);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		app_window_error_message (_tmp6_, NULL);
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp11_ = application_get_instance ();
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp12_ = _tmp11_;
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		application_panic (_tmp12_);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_application_unref0 (_tmp12_);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = application_get_instance ();
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = _tmp7_;
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		application_panic (_tmp8_);
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_application_unref0 (_tmp8_);
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 5063 "Page.c"
+#line 5088 "Page.c"
 	}
-	__finally253:
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally254:
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (ui_file);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (ui_resource);
+#line 574 "/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 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5076 "Page.c"
+#line 5101 "Page.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (ui_file);
-#line 5080 "Page.c"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_free0 (ui_resource);
+#line 5105 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 5087 "Page.c"
+#line 5112 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 5096 "Page.c"
+#line 5121 "Page.c"
 }
 
 
@@ -5101,32 +5126,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_ = NULL;
 	InjectionGroup** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 5115 "Page.c"
+#line 5140 "Page.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5121 "Page.c"
+#line 5146 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 5130 "Page.c"
+#line 5155 "Page.c"
 }
 
 
@@ -5135,11 +5160,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 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5143 "Page.c"
+#line 5168 "Page.c"
 }
 
 
@@ -5148,48 +5173,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 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5156 "Page.c"
+#line 5181 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5163 "Page.c"
+#line 5188 "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 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5170 "Page.c"
+#line 5195 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5177 "Page.c"
+#line 5202 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5184 "Page.c"
+#line 5209 "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 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5193 "Page.c"
+#line 5218 "Page.c"
 }
 
 
@@ -5205,53 +5230,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5217 "Page.c"
+#line 5242 "Page.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/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 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/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 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/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 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/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 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/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 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5255 "Page.c"
+#line 5280 "Page.c"
 }
 
 
@@ -5269,86 +5294,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkWidget* _tmp12_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5281 "Page.c"
+#line 5306 "Page.c"
 	}
-#line 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/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 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/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 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/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 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/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 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/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 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_unset (_tmp12_);
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5323 "Page.c"
+#line 5348 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 643 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5338 "Page.c"
+#line 5363 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/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 5352 "Page.c"
+#line 5377 "Page.c"
 }
 
 
@@ -5357,72 +5382,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/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 5377 "Page.c"
+#line 5402 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 656 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 656 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/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 5391 "Page.c"
+#line 5416 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 660 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 660 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/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 5405 "Page.c"
+#line 5430 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5417 "Page.c"
+#line 5442 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5426 "Page.c"
+#line 5451 "Page.c"
 }
 
 
@@ -5431,21 +5456,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_ = NULL;
 	GtkDragResult _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5449 "Page.c"
+#line 5474 "Page.c"
 }
 
 
@@ -5474,291 +5499,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 676 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_mask = 0;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5496 "Page.c"
+#line 5521 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5502 "Page.c"
+#line 5527 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5508 "Page.c"
+#line 5533 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5512 "Page.c"
+#line 5537 "Page.c"
 	}
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5540 "Page.c"
+#line 5565 "Page.c"
 	} else {
 		GdkPoint _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5550 "Page.c"
+#line 5575 "Page.c"
 	}
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5560 "Page.c"
+#line 5585 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5566 "Page.c"
+#line 5591 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5572 "Page.c"
+#line 5597 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5576 "Page.c"
+#line 5601 "Page.c"
 	}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5588 "Page.c"
+#line 5613 "Page.c"
 		gint _tmp18_ = 0;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5594 "Page.c"
+#line 5619 "Page.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5606 "Page.c"
+#line 5631 "Page.c"
 		gint _tmp23_ = 0;
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5612 "Page.c"
+#line 5637 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5620 "Page.c"
+#line 5645 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5626 "Page.c"
+#line 5651 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5632 "Page.c"
+#line 5657 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5636 "Page.c"
+#line 5661 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5648 "Page.c"
+#line 5673 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5657 "Page.c"
+#line 5682 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5669 "Page.c"
+#line 5694 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5678 "Page.c"
+#line 5703 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5690 "Page.c"
+#line 5715 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5699 "Page.c"
+#line 5724 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5711 "Page.c"
+#line 5736 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5720 "Page.c"
+#line 5745 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5732 "Page.c"
+#line 5757 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5741 "Page.c"
+#line 5766 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5753 "Page.c"
+#line 5778 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5762 "Page.c"
+#line 5787 "Page.c"
 }
 
 
@@ -5766,19 +5791,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 732 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 732 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5782 "Page.c"
+#line 5807 "Page.c"
 		{
 			GtkWidget* _tmp2_ = NULL;
 			GdkEventButton* _tmp4_ = NULL;
@@ -5787,79 +5812,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_ = 0.0;
 			GdkEventButton* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5795 "Page.c"
+#line 5820 "Page.c"
 				GtkWidget* _tmp3_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5801 "Page.c"
+#line 5826 "Page.c"
 			}
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.y = (gint) _tmp7_;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5823 "Page.c"
+#line 5848 "Page.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5827 "Page.c"
+#line 5852 "Page.c"
 		{
 			GdkEventButton* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5839 "Page.c"
+#line 5864 "Page.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5843 "Page.c"
+#line 5868 "Page.c"
 		{
 			GdkEventButton* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5855 "Page.c"
+#line 5880 "Page.c"
 		}
 		default:
 		{
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 751 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 751 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5863 "Page.c"
+#line 5888 "Page.c"
 		}
 	}
 }
@@ -5869,78 +5894,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5885 "Page.c"
+#line 5910 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down = _tmp2_;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5904 "Page.c"
+#line 5929 "Page.c"
 		}
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5908 "Page.c"
+#line 5933 "Page.c"
 		{
 			GdkEventButton* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5920 "Page.c"
+#line 5945 "Page.c"
 		}
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5924 "Page.c"
+#line 5949 "Page.c"
 		{
 			GdkEventButton* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5936 "Page.c"
+#line 5961 "Page.c"
 		}
 		default:
 		{
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5944 "Page.c"
+#line 5969 "Page.c"
 		}
 	}
 }
@@ -5948,195 +5973,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 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5956 "Page.c"
+#line 5981 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 5965 "Page.c"
+#line 5990 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5975 "Page.c"
+#line 6000 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 5984 "Page.c"
+#line 6009 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5994 "Page.c"
+#line 6019 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 6003 "Page.c"
+#line 6028 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6013 "Page.c"
+#line 6038 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 6022 "Page.c"
+#line 6047 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6032 "Page.c"
+#line 6057 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 6041 "Page.c"
+#line 6066 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6051 "Page.c"
+#line 6076 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 6060 "Page.c"
+#line 6085 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6070 "Page.c"
+#line 6095 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 798 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 798 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 6079 "Page.c"
+#line 6104 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6089 "Page.c"
+#line 6114 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 6098 "Page.c"
+#line 6123 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 807 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 807 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6110 "Page.c"
+#line 6135 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 6119 "Page.c"
+#line 6144 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6131 "Page.c"
+#line 6156 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6140 "Page.c"
+#line 6165 "Page.c"
 }
 
 
@@ -6155,248 +6180,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6179 "Page.c"
+#line 6204 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6210 "Page.c"
+#line 6235 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6223 "Page.c"
+#line 6248 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6230 "Page.c"
+#line 6255 "Page.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6238 "Page.c"
+#line 6263 "Page.c"
 				}
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = TRUE;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6250 "Page.c"
+#line 6275 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6256 "Page.c"
+#line 6281 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6269 "Page.c"
+#line 6294 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6276 "Page.c"
+#line 6301 "Page.c"
 				}
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6284 "Page.c"
+#line 6309 "Page.c"
 				}
-#line 831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = TRUE;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6296 "Page.c"
+#line 6321 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6302 "Page.c"
+#line 6327 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6315 "Page.c"
+#line 6340 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6322 "Page.c"
+#line 6347 "Page.c"
 				}
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 844 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 844 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6330 "Page.c"
+#line 6355 "Page.c"
 				}
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = TRUE;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6342 "Page.c"
+#line 6367 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6348 "Page.c"
+#line 6373 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6361 "Page.c"
+#line 6386 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6368 "Page.c"
+#line 6393 "Page.c"
 				}
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6376 "Page.c"
+#line 6401 "Page.c"
 				}
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = TRUE;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6388 "Page.c"
+#line 6413 "Page.c"
 			}
 		}
 	}
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6400 "Page.c"
+#line 6425 "Page.c"
 }
 
 
@@ -6415,406 +6440,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6439 "Page.c"
+#line 6464 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6470 "Page.c"
+#line 6495 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6483 "Page.c"
+#line 6508 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6490 "Page.c"
+#line 6515 "Page.c"
 				}
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6498 "Page.c"
+#line 6523 "Page.c"
 				}
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6510 "Page.c"
+#line 6535 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6516 "Page.c"
+#line 6541 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6529 "Page.c"
+#line 6554 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6536 "Page.c"
+#line 6561 "Page.c"
 				}
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6544 "Page.c"
+#line 6569 "Page.c"
 				}
-#line 880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6556 "Page.c"
+#line 6581 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6562 "Page.c"
+#line 6587 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6575 "Page.c"
+#line 6600 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6582 "Page.c"
+#line 6607 "Page.c"
 				}
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6590 "Page.c"
+#line 6615 "Page.c"
 				}
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = FALSE;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6602 "Page.c"
+#line 6627 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6608 "Page.c"
+#line 6633 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6621 "Page.c"
+#line 6646 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6628 "Page.c"
+#line 6653 "Page.c"
 				}
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6636 "Page.c"
+#line 6661 "Page.c"
 				}
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6648 "Page.c"
+#line 6673 "Page.c"
 			}
 		}
 	}
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6660 "Page.c"
+#line 6685 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 915 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 915 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6676 "Page.c"
+#line 6701 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 918 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 918 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6690 "Page.c"
+#line 6715 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6697 "Page.c"
+#line 6722 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6706 "Page.c"
+#line 6731 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6713 "Page.c"
+#line 6738 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6722 "Page.c"
+#line 6747 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6729 "Page.c"
+#line 6754 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6738 "Page.c"
+#line 6763 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6745 "Page.c"
+#line 6770 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6754 "Page.c"
+#line 6779 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6761 "Page.c"
+#line 6786 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6770 "Page.c"
+#line 6795 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6777 "Page.c"
+#line 6802 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6786 "Page.c"
+#line 6811 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6800 "Page.c"
+#line 6825 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6809 "Page.c"
+#line 6834 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6818 "Page.c"
+#line 6843 "Page.c"
 }
 
 
@@ -6845,41 +6870,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_ = NULL;
 	GdkRectangle _tmp52_ = {0};
 	gboolean _tmp53_ = FALSE;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 944 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 944 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 945 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 6883 "Page.c"
+#line 6908 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_ = {0};
 		gint _tmp11_ = 0;
@@ -6890,193 +6915,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_ = 0;
 		GdkRectangle _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 6906 "Page.c"
+#line 6931 "Page.c"
 		} else {
 			GdkRectangle _tmp14_ = {0};
 			gint _tmp15_ = 0;
 			GdkRectangle _tmp16_ = {0};
 			gint _tmp17_ = 0;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 6922 "Page.c"
+#line 6947 "Page.c"
 		}
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 6926 "Page.c"
+#line 6951 "Page.c"
 			GdkRectangle _tmp18_ = {0};
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 955 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 6934 "Page.c"
+#line 6959 "Page.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 6948 "Page.c"
+#line 6973 "Page.c"
 		} else {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			GdkRectangle _tmp26_ = {0};
 			gint _tmp27_ = 0;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 6964 "Page.c"
+#line 6989 "Page.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 6968 "Page.c"
+#line 6993 "Page.c"
 			GdkRectangle _tmp28_ = {0};
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 6976 "Page.c"
+#line 7001 "Page.c"
 		}
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/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 6980 "Page.c"
+#line 7005 "Page.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 6994 "Page.c"
+#line 7019 "Page.c"
 	} else {
 		GdkRectangle _tmp34_ = {0};
 		gint _tmp35_ = 0;
 		GdkRectangle _tmp36_ = {0};
 		gint _tmp37_ = 0;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 7010 "Page.c"
+#line 7035 "Page.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 7014 "Page.c"
+#line 7039 "Page.c"
 		GdkRectangle _tmp38_ = {0};
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 7020 "Page.c"
+#line 7045 "Page.c"
 	}
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 7034 "Page.c"
+#line 7059 "Page.c"
 	} else {
 		GdkRectangle _tmp44_ = {0};
 		gint _tmp45_ = 0;
 		GdkRectangle _tmp46_ = {0};
 		gint _tmp47_ = 0;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 7050 "Page.c"
+#line 7075 "Page.c"
 	}
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 7054 "Page.c"
+#line 7079 "Page.c"
 		GdkRectangle _tmp48_ = {0};
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 7060 "Page.c"
+#line 7085 "Page.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = _tmp50_;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7080 "Page.c"
+#line 7105 "Page.c"
 }
 
 
@@ -7089,117 +7114,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 981 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 981 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7103 "Page.c"
+#line 7128 "Page.c"
 	}
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7115 "Page.c"
+#line 7140 "Page.c"
 	}
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp3_;
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 7125 "Page.c"
+#line 7150 "Page.c"
 		GtkAllocation _tmp5_ = {0};
 		GdkRectangle _tmp6_ = {0};
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 7134 "Page.c"
+#line 7159 "Page.c"
 	}
-#line 987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7140 "Page.c"
+#line 7165 "Page.c"
 		GtkAllocation _tmp8_ = {0};
 		GdkRectangle _tmp9_ = {0};
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7149 "Page.c"
+#line 7174 "Page.c"
 	}
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 996 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7161 "Page.c"
+#line 7186 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7175 "Page.c"
+#line 7200 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7184 "Page.c"
+#line 7209 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7194 "Page.c"
+#line 7219 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 1003 "/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 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7203 "Page.c"
+#line 7228 "Page.c"
 }
 
 
@@ -7215,29 +7240,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_ = 0;
 	GdkModifierType _tmp14_ = 0;
 	gboolean _tmp15_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/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 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7229 "Page.c"
+#line 7254 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7241 "Page.c"
+#line 7266 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
@@ -7245,41 +7270,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_ = 0.0;
 		GdkEventMotion* _tmp9_ = NULL;
 		GdkModifierType _tmp10_ = 0;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7267 "Page.c"
+#line 7292 "Page.c"
 	}
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7283 "Page.c"
+#line 7308 "Page.c"
 }
 
 
@@ -7287,87 +7312,87 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkScrollDirection _tmp1_ = 0;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7303 "Page.c"
+#line 7328 "Page.c"
 		{
 			GdkEventScroll* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7315 "Page.c"
+#line 7340 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7319 "Page.c"
+#line 7344 "Page.c"
 		{
 			GdkEventScroll* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7331 "Page.c"
+#line 7356 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7335 "Page.c"
+#line 7360 "Page.c"
 		{
 			GdkEventScroll* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7347 "Page.c"
+#line 7372 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7351 "Page.c"
+#line 7376 "Page.c"
 		{
 			GdkEventScroll* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7363 "Page.c"
+#line 7388 "Page.c"
 		}
 		default:
 		{
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7371 "Page.c"
+#line 7396 "Page.c"
 		}
 	}
 }
@@ -7375,144 +7400,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 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7385 "Page.c"
+#line 7410 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7394 "Page.c"
+#line 7419 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7406 "Page.c"
+#line 7431 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7415 "Page.c"
+#line 7440 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7427 "Page.c"
+#line 7452 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7436 "Page.c"
+#line 7461 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7448 "Page.c"
+#line 7473 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7457 "Page.c"
+#line 7482 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7467 "Page.c"
+#line 7492 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7476 "Page.c"
+#line 7501 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7488 "Page.c"
+#line 7513 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7497 "Page.c"
+#line 7522 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7507 "Page.c"
+#line 7532 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7516 "Page.c"
+#line 7541 "Page.c"
 }
 
 
@@ -7521,72 +7546,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp3_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7535 "Page.c"
+#line 7560 "Page.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7542 "Page.c"
+#line 7567 "Page.c"
 	}
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7550 "Page.c"
+#line 7575 "Page.c"
 	}
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7556 "Page.c"
+#line 7581 "Page.c"
 		GtkMenu* _tmp4_ = NULL;
 		guint32 _tmp5_ = 0U;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7565 "Page.c"
+#line 7590 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
 		GdkEventButton* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
 		GdkEventButton* _tmp9_ = NULL;
 		guint32 _tmp10_ = 0U;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7584 "Page.c"
+#line 7609 "Page.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7590 "Page.c"
+#line 7615 "Page.c"
 }
 
 
@@ -7601,166 +7626,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_ = NULL;
 	GdkWindow* _tmp11_ = NULL;
 	GdkWindow* _tmp20_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7621 "Page.c"
+#line 7646 "Page.c"
 		GtkWidget* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
 		GdkCursor* _tmp7_ = NULL;
 		GdkCursorType _tmp8_ = 0;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7638 "Page.c"
+#line 7663 "Page.c"
 	}
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7648 "Page.c"
+#line 7673 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7655 "Page.c"
+#line 7680 "Page.c"
 			GdkWindow* _tmp17_ = NULL;
 			GdkWindow* _tmp18_ = NULL;
 			GdkWindow* _tmp19_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7661 "Page.c"
+#line 7686 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7668 "Page.c"
+#line 7693 "Page.c"
 					GdkWindow* _tmp15_ = NULL;
 					GdkCursor* _tmp16_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7677 "Page.c"
+#line 7702 "Page.c"
 				} else {
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7681 "Page.c"
+#line 7706 "Page.c"
 				}
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7687 "Page.c"
+#line 7712 "Page.c"
 				}
 			}
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7702 "Page.c"
+#line 7727 "Page.c"
 		}
 	}
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7709 "Page.c"
+#line 7734 "Page.c"
 		GdkWindow* _tmp21_ = NULL;
 		GdkCursor* _tmp22_ = NULL;
 		GdkCursorType _tmp23_ = 0;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7721 "Page.c"
+#line 7746 "Page.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7725 "Page.c"
+#line 7750 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_ = 0;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7737 "Page.c"
+#line 7762 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7746 "Page.c"
+#line 7771 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_ = 0U;
-#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7758 "Page.c"
+#line 7783 "Page.c"
 		guint _tmp1_ = 0U;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7764 "Page.c"
+#line 7789 "Page.c"
 	}
 }
 
@@ -7768,41 +7793,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
 	guint _tmp1_ = 0U;
-#line 1113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7782 "Page.c"
+#line 7807 "Page.c"
 		guint _tmp2_ = 0U;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7788 "Page.c"
+#line 7813 "Page.c"
 	}
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7792 "Page.c"
+#line 7817 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
-#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7806 "Page.c"
+#line 7831 "Page.c"
 }
 
 
@@ -7810,29 +7835,29 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7822 "Page.c"
+#line 7847 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7828 "Page.c"
+#line 7853 "Page.c"
 	} else {
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7832 "Page.c"
+#line 7857 "Page.c"
 	}
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7836 "Page.c"
+#line 7861 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
@@ -7844,103 +7869,103 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 		GdkCursorType _tmp11_ = 0;
 		GdkCursor* _tmp12_ = NULL;
 		GdkCursor* _tmp13_ = NULL;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7876 "Page.c"
+#line 7901 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7886 "Page.c"
+#line 7911 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7895 "Page.c"
+#line 7920 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp2_ = 0;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 7908 "Page.c"
+#line 7933 "Page.c"
 		GdkCursorType _tmp1_ = 0;
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 7916 "Page.c"
+#line 7941 "Page.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 7922 "Page.c"
+#line 7947 "Page.c"
 		guint _tmp3_ = 0U;
 		gint _tmp5_ = 0;
 		guint _tmp6_ = 0U;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 7930 "Page.c"
+#line 7955 "Page.c"
 			guint _tmp4_ = 0U;
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 7936 "Page.c"
+#line 7961 "Page.c"
 		}
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/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 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 7944 "Page.c"
+#line 7969 "Page.c"
 	}
 }
 
@@ -7948,15 +7973,15 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 7960 "Page.c"
+#line 7985 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_ = NULL;
 		GdkWindow* _tmp2_ = NULL;
@@ -7967,41 +7992,41 @@ static gboolean page_on_hide_cursor (Page* self) {
 		GdkDisplay* _tmp7_ = NULL;
 		GdkCursor* _tmp8_ = NULL;
 		GdkCursor* _tmp9_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7997 "Page.c"
+#line 8022 "Page.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8005 "Page.c"
+#line 8030 "Page.c"
 }
 
 
@@ -8010,25 +8035,25 @@ void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_
 	AppWindow* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (id != NULL);
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (new_label != NULL);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = id;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = new_label;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 8032 "Page.c"
+#line 8057 "Page.c"
 }
 
 
@@ -8038,33 +8063,33 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 	GMenuModel* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	GMenuModel* section = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 8056 "Page.c"
+#line 8081 "Page.c"
 	{
 		gint i = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 8061 "Page.c"
+#line 8086 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 8068 "Page.c"
+#line 8093 "Page.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				gint _tmp6_ = 0;
@@ -8073,71 +8098,71 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 8079 "Page.c"
+#line 8104 "Page.c"
 					gint _tmp3_ = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 8085 "Page.c"
+#line 8110 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 8095 "Page.c"
+#line 8120 "Page.c"
 					GMenuModel* _tmp7_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 8101 "Page.c"
+#line 8126 "Page.c"
 				} else {
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 8105 "Page.c"
+#line 8130 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 8111 "Page.c"
+#line 8136 "Page.c"
 				}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8127 "Page.c"
+#line 8152 "Page.c"
 					GMenuModel* _tmp12_ = NULL;
 					gint _tmp13_ = 0;
 					GMenuModel* _tmp14_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8141 "Page.c"
+#line 8166 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
 					GMenuModel* _tmp15_ = NULL;
@@ -8147,45 +8172,45 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 					gint sub_items = 0;
 					GMenuModel* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8169 "Page.c"
+#line 8194 "Page.c"
 					}
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8177 "Page.c"
+#line 8202 "Page.c"
 					{
 						gint j = 0;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8182 "Page.c"
+#line 8207 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8189 "Page.c"
+#line 8214 "Page.c"
 								gboolean _tmp23_ = FALSE;
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
@@ -8194,91 +8219,91 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 								gint _tmp28_ = 0;
 								GMenuModel* _tmp29_ = NULL;
 								GMenuModel* _tmp30_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8200 "Page.c"
+#line 8225 "Page.c"
 									gint _tmp22_ = 0;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8206 "Page.c"
+#line 8231 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8216 "Page.c"
+#line 8241 "Page.c"
 									GMenuModel* _tmp26_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8222 "Page.c"
+#line 8247 "Page.c"
 								} else {
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8226 "Page.c"
+#line 8251 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8232 "Page.c"
+#line 8257 "Page.c"
 								}
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8246 "Page.c"
+#line 8271 "Page.c"
 									GMenuModel* _tmp31_ = NULL;
 									const gchar* _tmp32_ = NULL;
 									GMenuModel* _tmp33_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8260 "Page.c"
+#line 8285 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8264 "Page.c"
+#line 8289 "Page.c"
 							}
 						}
 					}
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8270 "Page.c"
+#line 8295 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8274 "Page.c"
+#line 8299 "Page.c"
 			}
 		}
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8282 "Page.c"
+#line 8307 "Page.c"
 }
 
 
@@ -8391,7 +8416,7 @@ static void page_class_init (PageClass * klass) {
 	((PageClass *) klass)->set_page_cursor = page_real_set_page_cursor;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8395 "Page.c"
+#line 8420 "Page.c"
 }
 
 
@@ -8449,7 +8474,7 @@ static void page_instance_init (Page * self) {
 	self->priv->update_actions_scheduler = NULL;
 #line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->menubar_injected = FALSE;
-#line 8453 "Page.c"
+#line 8478 "Page.c"
 }
 
 
@@ -8475,7 +8500,7 @@ static void page_finalize (GObject* obj) {
 	_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (page_parent_class)->finalize (obj);
-#line 8479 "Page.c"
+#line 8504 "Page.c"
 }
 
 
@@ -8504,30 +8529,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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8510 "Page.c"
+#line 8535 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8517 "Page.c"
+#line 8542 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8524 "Page.c"
+#line 8549 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8531 "Page.c"
+#line 8556 "Page.c"
 }
 
 
@@ -8556,141 +8581,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
 	ViewCollection* _tmp22_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/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 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/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 1246 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/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 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/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 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/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 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/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 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/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 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/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 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8656 "Page.c"
+#line 8681 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8675 "Page.c"
+#line 8700 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8694 "Page.c"
+#line 8719 "Page.c"
 }
 
 
@@ -8701,44 +8726,44 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8719 "Page.c"
+#line 8744 "Page.c"
 		GtkMenu* _tmp5_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8727 "Page.c"
+#line 8752 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8736 "Page.c"
+#line 8761 "Page.c"
 	}
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8742 "Page.c"
+#line 8767 "Page.c"
 }
 
 
@@ -8747,11 +8772,11 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8755 "Page.c"
+#line 8780 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8760,52 +8785,52 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/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 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/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 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8790 "Page.c"
+#line 8815 "Page.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8800 "Page.c"
+#line 8825 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8809 "Page.c"
+#line 8834 "Page.c"
 }
 
 
@@ -8815,13 +8840,13 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_context_menu;
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8825 "Page.c"
+#line 8850 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8830,43 +8855,43 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->page_context_menu_path;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/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 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->page_context_menu = _tmp6_;
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page_context_menu;
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/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 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8860 "Page.c"
+#line 8885 "Page.c"
 	}
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->page_context_menu;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8870 "Page.c"
+#line 8895 "Page.c"
 }
 
 
@@ -8877,23 +8902,23 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8897 "Page.c"
+#line 8922 "Page.c"
 }
 
 
@@ -8901,24 +8926,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos");
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8913 "Page.c"
+#line 8938 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 8922 "Page.c"
+#line 8947 "Page.c"
 }
 
 
@@ -8926,42 +8951,42 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8938 "Page.c"
+#line 8963 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 8947 "Page.c"
+#line 8972 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 8956 "Page.c"
+#line 8981 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 8965 "Page.c"
+#line 8990 "Page.c"
 }
 
 
@@ -8969,61 +8994,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8983 "Page.c"
+#line 9008 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/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 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 8992 "Page.c"
+#line 9017 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 9001 "Page.c"
+#line 9026 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9011 "Page.c"
+#line 9036 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 9020 "Page.c"
+#line 9045 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 9027 "Page.c"
+#line 9052 "Page.c"
 }
 
 
@@ -9035,33 +9060,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_ = 0U;
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/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 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/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 9065 "Page.c"
+#line 9090 "Page.c"
 }
 
 
@@ -9074,35 +9099,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 1344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/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 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 9106 "Page.c"
+#line 9131 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -9117,37 +9142,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/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 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9151 "Page.c"
+#line 9176 "Page.c"
 			GtkAdjustment* _tmp19_ = NULL;
 			CheckerboardItem* _tmp20_ = NULL;
 			GdkRectangle _tmp21_ = {0};
@@ -9156,33 +9181,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			AdjustmentRelation _tmp26_ = 0;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9178 "Page.c"
+#line 9203 "Page.c"
 		} else {
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9182 "Page.c"
+#line 9207 "Page.c"
 		}
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9186 "Page.c"
+#line 9211 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_ = NULL;
 			GdkRectangle _tmp28_ = {0};
@@ -9191,38 +9216,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_ = 0.0;
 			GtkAdjustment* _tmp45_ = NULL;
 			gint _tmp46_ = 0;
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9209 "Page.c"
+#line 9234 "Page.c"
 				CheckerboardItem* _tmp32_ = NULL;
 				GdkRectangle _tmp33_ = {0};
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9226 "Page.c"
+#line 9251 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_ = NULL;
 				GdkRectangle _tmp37_ = {0};
@@ -9233,91 +9258,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_ = NULL;
 				gdouble _tmp43_ = 0.0;
 				gint _tmp44_ = 0;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9259 "Page.c"
+#line 9284 "Page.c"
 			}
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9267 "Page.c"
+#line 9292 "Page.c"
 		}
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9273 "Page.c"
+#line 9298 "Page.c"
 	}
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/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 9277 "Page.c"
+#line 9302 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9286 "Page.c"
+#line 9311 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9299 "Page.c"
+#line 9324 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1384 "/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 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9310 "Page.c"
+#line 9335 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9321 "Page.c"
+#line 9346 "Page.c"
 }
 
 
@@ -9327,87 +9352,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9345 "Page.c"
+#line 9370 "Page.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9359 "Page.c"
+#line 9384 "Page.c"
 	} else {
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9363 "Page.c"
+#line 9388 "Page.c"
 	}
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9367 "Page.c"
+#line 9392 "Page.c"
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9378 "Page.c"
+#line 9403 "Page.c"
 	} else {
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gboolean _tmp13_ = FALSE;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9396 "Page.c"
+#line 9421 "Page.c"
 			gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9407 "Page.c"
+#line 9432 "Page.c"
 		} else {
-#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9411 "Page.c"
+#line 9436 "Page.c"
 		}
 	}
 }
@@ -9417,27 +9442,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/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 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9435 "Page.c"
+#line 9460 "Page.c"
 		CheckerboardLayout* _tmp3_ = NULL;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9441 "Page.c"
+#line 9466 "Page.c"
 	}
 }
 
@@ -9445,23 +9470,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 1408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9459 "Page.c"
+#line 9484 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9465 "Page.c"
+#line 9490 "Page.c"
 	}
 }
 
@@ -9471,21 +9496,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 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/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 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9489 "Page.c"
+#line 9514 "Page.c"
 }
 
 
@@ -9495,43 +9520,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	CheckerboardItem* _tmp3_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9513 "Page.c"
+#line 9538 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9522 "Page.c"
+#line 9547 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9535 "Page.c"
+#line 9560 "Page.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataView* view = NULL;
@@ -9546,73 +9571,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_ = NULL;
 			CheckerboardItem* _tmp12_ = NULL;
 			CheckerboardItem* _tmp13_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9558 "Page.c"
+#line 9583 "Page.c"
 			}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9582 "Page.c"
+#line 9607 "Page.c"
 			}
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9594 "Page.c"
+#line 9619 "Page.c"
 			}
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9606 "Page.c"
+#line 9631 "Page.c"
 			}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9612 "Page.c"
+#line 9637 "Page.c"
 		}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9616 "Page.c"
+#line 9641 "Page.c"
 	}
 }
 
@@ -9629,138 +9654,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9663 "Page.c"
+#line 9688 "Page.c"
 	gboolean _tmp45_ = FALSE;
 	gboolean _tmp46_ = FALSE;
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9692 "Page.c"
+#line 9717 "Page.c"
 			default:
 			{
 				guint _tmp8_ = 0U;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9704 "Page.c"
+#line 9729 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9710 "Page.c"
+#line 9735 "Page.c"
 			default:
 			{
 				guint _tmp9_ = 0U;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9722 "Page.c"
+#line 9747 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9728 "Page.c"
+#line 9753 "Page.c"
 			default:
 			{
 				guint _tmp10_ = 0U;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9740 "Page.c"
+#line 9765 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9746 "Page.c"
+#line 9771 "Page.c"
 			default:
 			{
 				guint _tmp11_ = 0U;
-#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9758 "Page.c"
+#line 9783 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9764 "Page.c"
+#line 9789 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9770,45 +9795,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_ = NULL;
 				CheckerboardItem* _tmp16_ = NULL;
 				guint _tmp18_ = 0U;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9790 "Page.c"
+#line 9815 "Page.c"
 					CheckerboardItem* _tmp17_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9796 "Page.c"
+#line 9821 "Page.c"
 				}
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9806 "Page.c"
+#line 9831 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9812 "Page.c"
+#line 9837 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -9818,100 +9843,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_ = NULL;
 				CheckerboardItem* _tmp23_ = NULL;
 				guint _tmp25_ = 0U;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9838 "Page.c"
+#line 9863 "Page.c"
 					CheckerboardItem* _tmp24_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9844 "Page.c"
+#line 9869 "Page.c"
 				}
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9854 "Page.c"
+#line 9879 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9860 "Page.c"
+#line 9885 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_ = NULL;
 				ViewCollection* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 9879 "Page.c"
+#line 9904 "Page.c"
 					ViewCollection* _tmp30_ = NULL;
 					ViewCollection* _tmp31_ = NULL;
 					DataView* _tmp32_ = NULL;
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 9901 "Page.c"
+#line 9926 "Page.c"
 				} else {
-#line 1492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 9905 "Page.c"
+#line 9930 "Page.c"
 				}
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9909 "Page.c"
+#line 9934 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9915 "Page.c"
+#line 9940 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -9925,89 +9950,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_ = NULL;
 				ViewCollection* _tmp43_ = NULL;
 				Marker* _tmp44_ = NULL;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/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 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9963 "Page.c"
+#line 9988 "Page.c"
 			}
 		}
 	} else {
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9969 "Page.c"
+#line 9994 "Page.c"
 			default:
 			{
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9976 "Page.c"
+#line 10001 "Page.c"
 			}
 		}
 	}
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9988 "Page.c"
+#line 10013 "Page.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 9992 "Page.c"
+#line 10017 "Page.c"
 		GdkEventKey* _tmp47_ = NULL;
 		gboolean _tmp48_ = FALSE;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/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 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 10001 "Page.c"
+#line 10026 "Page.c"
 	} else {
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 10005 "Page.c"
+#line 10030 "Page.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10011 "Page.c"
+#line 10036 "Page.c"
 }
 
 
@@ -10031,62 +10056,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_ = NULL;
 	gint _tmp108_ = 0;
 	gboolean _tmp109_ = FALSE;
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 10045 "Page.c"
+#line 10070 "Page.c"
 		GdkEventButton* _tmp3_ = NULL;
 		GdkEventType _tmp4_ = 0;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 10054 "Page.c"
+#line 10079 "Page.c"
 	} else {
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 10058 "Page.c"
+#line 10083 "Page.c"
 	}
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10066 "Page.c"
+#line 10091 "Page.c"
 	}
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 10090 "Page.c"
+#line 10115 "Page.c"
 		CheckerboardLayout* _tmp13_ = NULL;
 		CheckerboardItem* _tmp14_ = NULL;
 		GdkEventButton* _tmp15_ = NULL;
@@ -10099,41 +10124,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_ = 0U;
 		CheckerboardLayout* _tmp80_ = NULL;
 		CheckerboardItem* _tmp81_ = NULL;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10129 "Page.c"
+#line 10154 "Page.c"
 		}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10137 "Page.c"
+#line 10162 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_ = NULL;
@@ -10146,68 +10171,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_ = NULL;
 				CheckerboardItem* _tmp31_ = NULL;
 				gboolean _tmp32_ = FALSE;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/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 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10180 "Page.c"
+#line 10205 "Page.c"
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardItem* _tmp34_ = NULL;
 					CheckerboardItem* _tmp35_ = NULL;
 					CheckerboardItem* _tmp36_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10201 "Page.c"
+#line 10226 "Page.c"
 				}
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10207 "Page.c"
+#line 10232 "Page.c"
 			}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10211 "Page.c"
+#line 10236 "Page.c"
 			{
 				ViewCollection* _tmp37_ = NULL;
 				ViewCollection* _tmp38_ = NULL;
@@ -10216,92 +10241,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_ = NULL;
 				CheckerboardItem* _tmp44_ = NULL;
 				CheckerboardItem* _tmp45_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10232 "Page.c"
+#line 10257 "Page.c"
 					CheckerboardItem* _tmp40_ = NULL;
 					CheckerboardItem* _tmp41_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10243 "Page.c"
+#line 10268 "Page.c"
 				}
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10261 "Page.c"
+#line 10286 "Page.c"
 			}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10265 "Page.c"
+#line 10290 "Page.c"
 			{
 				CheckerboardItem* _tmp46_ = NULL;
 				CheckerboardItem* _tmp49_ = NULL;
 				CheckerboardItem* _tmp50_ = NULL;
 				CheckerboardItem* _tmp51_ = NULL;
 				CheckerboardItem* _tmp52_ = NULL;
-#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10276 "Page.c"
+#line 10301 "Page.c"
 					CheckerboardItem* _tmp47_ = NULL;
 					CheckerboardItem* _tmp48_ = NULL;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10287 "Page.c"
+#line 10312 "Page.c"
 				}
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10305 "Page.c"
+#line 10330 "Page.c"
 			}
 			default:
 			{
@@ -10311,34 +10336,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_ = NULL;
 				CheckerboardItem* _tmp78_ = NULL;
 				CheckerboardItem* _tmp79_ = NULL;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10321 "Page.c"
+#line 10346 "Page.c"
 					CheckerboardItem* _tmp55_ = NULL;
 					CheckerboardItem* _tmp56_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10332 "Page.c"
+#line 10357 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_ = NULL;
 					gboolean _tmp58_ = FALSE;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10342 "Page.c"
+#line 10367 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_ = NULL;
 						ViewCollection* _tmp60_ = NULL;
@@ -10357,91 +10382,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_ = NULL;
 						Marker* _tmp74_ = NULL;
 						Marker* _tmp75_ = NULL;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/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 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10415 "Page.c"
+#line 10440 "Page.c"
 					}
 				}
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10436 "Page.c"
+#line 10461 "Page.c"
 			}
 		}
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10445 "Page.c"
+#line 10470 "Page.c"
 	} else {
 		guint _tmp82_ = 0U;
 		GeeArrayList* _tmp85_ = NULL;
@@ -10450,30 +10475,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_ = 0.0;
 		GdkEventButton* _tmp104_ = NULL;
 		gdouble _tmp105_ = 0.0;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10458 "Page.c"
+#line 10483 "Page.c"
 			ViewCollection* _tmp83_ = NULL;
 			ViewCollection* _tmp84_ = NULL;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10469 "Page.c"
+#line 10494 "Page.c"
 		}
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10477 "Page.c"
+#line 10502 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_ = NULL;
@@ -10485,31 +10510,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_ = 0;
 			gint _tmp92_ = 0;
 			gint _view_index = 0;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10513 "Page.c"
+#line 10538 "Page.c"
 				gint _tmp93_ = 0;
 				gint _tmp94_ = 0;
 				gint _tmp95_ = 0;
@@ -10519,79 +10544,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_ = NULL;
 				GeeArrayList* _tmp99_ = NULL;
 				DataView* _tmp100_ = NULL;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10535 "Page.c"
+#line 10560 "Page.c"
 				}
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/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 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10553 "Page.c"
+#line 10578 "Page.c"
 			}
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10557 "Page.c"
+#line 10582 "Page.c"
 		}
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10577 "Page.c"
+#line 10602 "Page.c"
 	}
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10595 "Page.c"
+#line 10620 "Page.c"
 }
 
 
@@ -10612,152 +10637,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_ = NULL;
 	CheckerboardItem* _tmp16_ = NULL;
 	CheckerboardItem* _tmp17_ = NULL;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10630 "Page.c"
+#line 10655 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		CheckerboardItem* _tmp4_ = NULL;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10650 "Page.c"
+#line 10675 "Page.c"
 	}
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10662 "Page.c"
+#line 10687 "Page.c"
 	}
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10668 "Page.c"
+#line 10693 "Page.c"
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10685 "Page.c"
+#line 10710 "Page.c"
 	}
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10709 "Page.c"
+#line 10734 "Page.c"
 	}
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10717 "Page.c"
+#line 10742 "Page.c"
 		ViewCollection* _tmp18_ = NULL;
 		ViewCollection* _tmp19_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10728 "Page.c"
+#line 10753 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10738 "Page.c"
+#line 10763 "Page.c"
 			ViewCollection* _tmp22_ = NULL;
 			ViewCollection* _tmp23_ = NULL;
 			CheckerboardItem* _tmp24_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10752 "Page.c"
+#line 10777 "Page.c"
 		}
 	}
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10761 "Page.c"
+#line 10786 "Page.c"
 }
 
 
@@ -10778,50 +10803,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_ = NULL;
 	GdkEventButton* _tmp41_ = NULL;
 	gboolean _tmp42_ = FALSE;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10796 "Page.c"
+#line 10821 "Page.c"
 	}
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10814 "Page.c"
+#line 10839 "Page.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10825 "Page.c"
+#line 10850 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_ = NULL;
@@ -10832,63 +10857,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_ = NULL;
 				ViewCollection* _tmp16_ = NULL;
 				Marker* _tmp17_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/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 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10864 "Page.c"
+#line 10889 "Page.c"
 			}
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10868 "Page.c"
+#line 10893 "Page.c"
 			{
-#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10872 "Page.c"
+#line 10897 "Page.c"
 			}
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10876 "Page.c"
+#line 10901 "Page.c"
 			{
-#line 1675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10880 "Page.c"
+#line 10905 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 10892 "Page.c"
+#line 10917 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_ = NULL;
 					ViewCollection* _tmp21_ = NULL;
@@ -10907,99 +10932,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_ = NULL;
 					Marker* _tmp35_ = NULL;
 					Marker* _tmp36_ = NULL;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/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 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 10965 "Page.c"
+#line 10990 "Page.c"
 				}
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10969 "Page.c"
+#line 10994 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 10983 "Page.c"
+#line 11008 "Page.c"
 	}
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11003 "Page.c"
+#line 11028 "Page.c"
 }
 
 
@@ -11013,105 +11038,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_ = NULL;
 	CheckerboardItem* _tmp12_ = NULL;
 	CheckerboardItem* _tmp13_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 11023 "Page.c"
+#line 11048 "Page.c"
 		CheckerboardLayout* _tmp1_ = NULL;
 		CheckerboardItem* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkModifierType _tmp5_ = 0;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 11041 "Page.c"
+#line 11066 "Page.c"
 	}
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11053 "Page.c"
+#line 11078 "Page.c"
 	}
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 11059 "Page.c"
+#line 11084 "Page.c"
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 11069 "Page.c"
+#line 11094 "Page.c"
 	}
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11079 "Page.c"
+#line 11104 "Page.c"
 	}
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11097 "Page.c"
+#line 11122 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 11106 "Page.c"
+#line 11131 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11115 "Page.c"
+#line 11140 "Page.c"
 }
 
 
@@ -11134,95 +11159,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11168 "Page.c"
+#line 11193 "Page.c"
 	}
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11180 "Page.c"
+#line 11205 "Page.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11196 "Page.c"
+#line 11221 "Page.c"
 		GtkAdjustment* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/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 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11208 "Page.c"
+#line 11233 "Page.c"
 	} else {
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11212 "Page.c"
+#line 11237 "Page.c"
 	}
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/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 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11220 "Page.c"
+#line 11245 "Page.c"
 	}
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11226 "Page.c"
+#line 11251 "Page.c"
 }
 
 
@@ -11259,91 +11284,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_ = NULL;
 	ViewCollection* _tmp48_ = NULL;
 	Marker* _tmp49_ = NULL;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11285 "Page.c"
+#line 11310 "Page.c"
 	}
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11347 "Page.c"
+#line 11372 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_ = NULL;
@@ -11353,25 +11378,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gint _item_index = 0;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11375 "Page.c"
+#line 11400 "Page.c"
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
@@ -11383,109 +11408,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			CheckerboardItem* _tmp41_ = NULL;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11399 "Page.c"
+#line 11424 "Page.c"
 			}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11417 "Page.c"
+#line 11442 "Page.c"
 				Marker* _tmp37_ = NULL;
 				CheckerboardItem* _tmp38_ = NULL;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11426 "Page.c"
+#line 11451 "Page.c"
 			} else {
 				Marker* _tmp39_ = NULL;
 				CheckerboardItem* _tmp40_ = NULL;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11436 "Page.c"
+#line 11461 "Page.c"
 			}
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11442 "Page.c"
+#line 11467 "Page.c"
 				CheckerboardItem* _tmp42_ = NULL;
 				CheckerboardItem* _tmp43_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11453 "Page.c"
+#line 11478 "Page.c"
 			}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11457 "Page.c"
+#line 11482 "Page.c"
 		}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11461 "Page.c"
+#line 11486 "Page.c"
 	}
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11489 "Page.c"
+#line 11514 "Page.c"
 }
 
 
@@ -11517,77 +11542,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_ = NULL;
 	gdouble _tmp29_ = 0.0;
 	gint _tmp30_ = 0;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11535 "Page.c"
+#line 11560 "Page.c"
 	}
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/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 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/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 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11567 "Page.c"
+#line 11592 "Page.c"
 		{
 			gint _tmp12_ = 0;
 			CheckerboardLayout* _tmp13_ = NULL;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11587 "Page.c"
+#line 11612 "Page.c"
 		}
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11591 "Page.c"
+#line 11616 "Page.c"
 		{
 			gint _tmp16_ = 0;
 			CheckerboardLayout* _tmp17_ = NULL;
@@ -11595,78 +11620,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_ = 0;
 			GtkAdjustment* _tmp20_ = NULL;
 			gdouble _tmp21_ = 0.0;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11617 "Page.c"
+#line 11642 "Page.c"
 		}
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11621 "Page.c"
+#line 11646 "Page.c"
 		{
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11631 "Page.c"
+#line 11656 "Page.c"
 		}
 		default:
 		{
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11639 "Page.c"
+#line 11664 "Page.c"
 		}
 	}
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11670 "Page.c"
+#line 11695 "Page.c"
 }
 
 
@@ -11697,35 +11722,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_ = 0.0;
 	GtkAdjustment* _tmp53_ = NULL;
 	gint _tmp54_ = 0;
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/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 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11729 "Page.c"
+#line 11754 "Page.c"
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		Marker* marker = NULL;
@@ -11737,67 +11762,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_ = NULL;
 		ViewCollection* _tmp15_ = NULL;
 		Marker* _tmp16_ = NULL;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/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 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11775 "Page.c"
+#line 11800 "Page.c"
 	}
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/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 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11801 "Page.c"
+#line 11826 "Page.c"
 		GtkAdjustment* _tmp27_ = NULL;
 		CheckerboardItem* _tmp28_ = NULL;
 		GdkRectangle _tmp29_ = {0};
@@ -11806,70 +11831,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_ = {0};
 		gint _tmp33_ = 0;
 		AdjustmentRelation _tmp34_ = 0;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11828 "Page.c"
+#line 11853 "Page.c"
 	} else {
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11832 "Page.c"
+#line 11857 "Page.c"
 	}
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11840 "Page.c"
+#line 11865 "Page.c"
 	}
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11856 "Page.c"
+#line 11881 "Page.c"
 		CheckerboardItem* _tmp40_ = NULL;
 		GdkRectangle _tmp41_ = {0};
 		gint _tmp42_ = 0;
 		gint _tmp43_ = 0;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11873 "Page.c"
+#line 11898 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_ = NULL;
 		GdkRectangle _tmp45_ = {0};
@@ -11880,39 +11905,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gint _tmp52_ = 0;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11906 "Page.c"
+#line 11931 "Page.c"
 	}
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 11916 "Page.c"
+#line 11941 "Page.c"
 }
 
 
@@ -11931,171 +11956,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_ = 0;
 	CheckerboardItem* _tmp28_ = NULL;
 	CheckerboardItem* _tmp29_ = NULL;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11951 "Page.c"
+#line 11976 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 11957 "Page.c"
+#line 11982 "Page.c"
 		CheckerboardLayout* _tmp7_ = NULL;
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 11971 "Page.c"
+#line 11996 "Page.c"
 	} else {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 11975 "Page.c"
+#line 12000 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 11981 "Page.c"
+#line 12006 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_ = NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 11989 "Page.c"
+#line 12014 "Page.c"
 			ViewCollection* _tmp12_ = NULL;
 			ViewCollection* _tmp13_ = NULL;
 			CheckerboardItem* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/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 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 12006 "Page.c"
+#line 12031 "Page.c"
 		} else {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 12010 "Page.c"
+#line 12035 "Page.c"
 		}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 12014 "Page.c"
+#line 12039 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12018 "Page.c"
+#line 12043 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_ = NULL;
 		CheckerboardItem* _tmp17_ = NULL;
 		CheckerboardItem* _tmp18_ = NULL;
 		CheckerboardItem* _tmp19_ = NULL;
 		CheckerboardItem* _tmp20_ = NULL;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12047 "Page.c"
+#line 12072 "Page.c"
 	}
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 12053 "Page.c"
+#line 12078 "Page.c"
 		CheckerboardLayout* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 12067 "Page.c"
+#line 12092 "Page.c"
 		}
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 12073 "Page.c"
+#line 12098 "Page.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 12089 "Page.c"
+#line 12114 "Page.c"
 		CheckerboardItem* _tmp30_ = NULL;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 12095 "Page.c"
+#line 12120 "Page.c"
 	}
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 12099 "Page.c"
+#line 12124 "Page.c"
 }
 
 
@@ -12112,51 +12137,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_ = NULL;
 	CheckerboardItem* _tmp9_ = NULL;
 	CheckerboardItem* _tmp10_ = NULL;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/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 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12160 "Page.c"
+#line 12185 "Page.c"
 }
 
 
@@ -12171,29 +12196,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_ = NULL;
 	ViewCollection* _tmp29_ = NULL;
 	Marker* _tmp30_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12197 "Page.c"
+#line 12222 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -12202,27 +12227,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12226 "Page.c"
+#line 12251 "Page.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			DataObject* object = NULL;
@@ -12239,125 +12264,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_ = FALSE;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12251 "Page.c"
+#line 12276 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12273 "Page.c"
+#line 12298 "Page.c"
 			}
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12283 "Page.c"
+#line 12308 "Page.c"
 			}
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12291 "Page.c"
+#line 12316 "Page.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12298 "Page.c"
+#line 12323 "Page.c"
 			}
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12302 "Page.c"
+#line 12327 "Page.c"
 				Marker* _tmp23_ = NULL;
 				DataObject* _tmp24_ = NULL;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/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 12311 "Page.c"
+#line 12336 "Page.c"
 			}
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12317 "Page.c"
+#line 12342 "Page.c"
 				gboolean _tmp27_ = FALSE;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12323 "Page.c"
+#line 12348 "Page.c"
 			} else {
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12327 "Page.c"
+#line 12352 "Page.c"
 			}
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12337 "Page.c"
+#line 12362 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12343 "Page.c"
+#line 12368 "Page.c"
 		}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12347 "Page.c"
+#line 12372 "Page.c"
 	}
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12361 "Page.c"
+#line 12386 "Page.c"
 }
 
 
@@ -12365,65 +12390,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1923 "/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 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12377 "Page.c"
+#line 12402 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_ = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12384 "Page.c"
+#line 12409 "Page.c"
 	}
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12390 "Page.c"
+#line 12415 "Page.c"
 	}
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12396 "Page.c"
+#line 12421 "Page.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		CheckerboardItem* _tmp6_ = NULL;
 		CheckerboardItem* _tmp7_ = NULL;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12415 "Page.c"
+#line 12440 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12427 "Page.c"
+#line 12452 "Page.c"
 	}
 }
 
@@ -12437,48 +12462,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/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 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12473 "Page.c"
+#line 12498 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12482 "Page.c"
+#line 12507 "Page.c"
 }
 
 
@@ -12491,48 +12516,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/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 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12527 "Page.c"
+#line 12552 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12536 "Page.c"
+#line 12561 "Page.c"
 }
 
 
@@ -12545,54 +12570,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12577 "Page.c"
+#line 12602 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12589 "Page.c"
+#line 12614 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12596 "Page.c"
+#line 12621 "Page.c"
 }
 
 
@@ -12608,113 +12633,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12656 "Page.c"
+#line 12681 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12686 "Page.c"
+#line 12711 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject* obj) {
 	CheckerboardPage * self;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->item_context_menu);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12718 "Page.c"
+#line 12743 "Page.c"
 }
 
 
@@ -12743,18 +12768,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 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12749 "Page.c"
+#line 12774 "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 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12758 "Page.c"
+#line 12783 "Page.c"
 }
 
 
@@ -12774,71 +12799,71 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_ = NULL;
 	GtkDrawingArea* _tmp12_ = NULL;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/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 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/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 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/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 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/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 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/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 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/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 2000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/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 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/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 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/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 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/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 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12842 "Page.c"
+#line 12867 "Page.c"
 }
 
 
@@ -12846,38 +12871,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12860 "Page.c"
+#line 12885 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 12875 "Page.c"
+#line 12900 "Page.c"
 		TransitionClock* _tmp2_ = NULL;
-#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 12881 "Page.c"
+#line 12906 "Page.c"
 	}
 }
 
@@ -12889,53 +12914,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_ = NULL;
 	TransitionClock* _tmp4_ = NULL;
 	gint _tmp8_ = 0;
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 12917 "Page.c"
+#line 12942 "Page.c"
 		TransitionEffectsManager* _tmp5_ = NULL;
 		TransitionEffectsManager* _tmp6_ = NULL;
 		TransitionClock* _tmp7_ = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 12933 "Page.c"
+#line 12958 "Page.c"
 	}
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 12939 "Page.c"
+#line 12964 "Page.c"
 }
 
 
@@ -12967,86 +12992,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
 	cairo_t* _tmp51_ = NULL;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12993 "Page.c"
+#line 13018 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		GdkPixbuf* _tmp15_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 13001 "Page.c"
+#line 13026 "Page.c"
 			ZoomBuffer* _tmp7_ = NULL;
 			ZoomBuffer* _tmp8_ = NULL;
 			ZoomState _tmp9_ = {0};
 			GdkPixbuf* _tmp10_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13020 "Page.c"
+#line 13045 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_ = NULL;
 			ZoomBuffer* _tmp12_ = NULL;
 			ZoomState _tmp13_ = {0};
 			GdkPixbuf* _tmp14_ = NULL;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 13040 "Page.c"
+#line 13065 "Page.c"
 		}
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13050 "Page.c"
+#line 13075 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_ = NULL;
@@ -13068,113 +13093,113 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPixbuf* _tmp33_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 13118 "Page.c"
+#line 13143 "Page.c"
 	}
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13128 "Page.c"
+#line 13153 "Page.c"
 	}
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13178 "Page.c"
+#line 13203 "Page.c"
 }
 
 
@@ -13186,39 +13211,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13222 "Page.c"
+#line 13247 "Page.c"
 }
 
 
@@ -13230,230 +13255,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2076 "/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 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13266 "Page.c"
+#line 13291 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13276 "Page.c"
+#line 13301 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13285 "Page.c"
+#line 13310 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_ = NULL;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13295 "Page.c"
+#line 13320 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13306 "Page.c"
+#line 13331 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13316 "Page.c"
+#line 13341 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_ = {0};
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13328 "Page.c"
+#line 13353 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2101 "/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 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13337 "Page.c"
+#line 13362 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13350 "Page.c"
+#line 13375 "Page.c"
 	}
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13360 "Page.c"
+#line 13385 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13369 "Page.c"
+#line 13394 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13379 "Page.c"
+#line 13404 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13388 "Page.c"
+#line 13413 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_ = {0};
-#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2125 "/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 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13402 "Page.c"
+#line 13427 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13421 "Page.c"
+#line 13446 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13440 "Page.c"
+#line 13465 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_ = NULL;
-#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/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 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13457 "Page.c"
+#line 13482 "Page.c"
 	}
 }
 
@@ -13462,21 +13487,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/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 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2154 "/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 13480 "Page.c"
+#line 13505 "Page.c"
 	}
 }
 
@@ -13493,92 +13518,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_ = NULL;
 	GtkDrawingArea* _tmp9_ = NULL;
 	Direction* _tmp10_ = NULL;
-#line 2155 "/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 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13547 "Page.c"
+#line 13572 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
-#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13575 "Page.c"
+#line 13600 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13582 "Page.c"
+#line 13607 "Page.c"
 }
 
 
@@ -13586,38 +13611,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 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13600 "Page.c"
+#line 13625 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13614 "Page.c"
+#line 13639 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13621 "Page.c"
+#line 13646 "Page.c"
 }
 
 
@@ -13625,17 +13650,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 2194 "/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 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13639 "Page.c"
+#line 13664 "Page.c"
 }
 
 
@@ -13645,25 +13670,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_ = 0;
 	cairo_t* _tmp3_ = NULL;
 	PangoLayout* _tmp4_ = NULL;
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13667 "Page.c"
+#line 13692 "Page.c"
 }
 
 
@@ -13672,55 +13697,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13688 "Page.c"
+#line 13713 "Page.c"
 		GtkWindow* _tmp4_ = NULL;
 		GtkWindow* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		Scaling _tmp7_ = {0};
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13705 "Page.c"
+#line 13730 "Page.c"
 	} else {
 		GtkViewport* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		Scaling _tmp10_ = {0};
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13718 "Page.c"
+#line 13743 "Page.c"
 	}
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13724 "Page.c"
+#line 13749 "Page.c"
 }
 
 
@@ -13728,17 +13753,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13742 "Page.c"
+#line 13767 "Page.c"
 }
 
 
@@ -13746,31 +13771,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/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 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13760 "Page.c"
+#line 13785 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 2217 "/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 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13774 "Page.c"
+#line 13799 "Page.c"
 }
 
 
@@ -13780,50 +13805,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_ = 0;
 	GdkRectangle _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13798 "Page.c"
+#line 13823 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13815 "Page.c"
+#line 13840 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
 		GdkRectangle _tmp4_ = {0};
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13827 "Page.c"
+#line 13852 "Page.c"
 	}
 }
 
@@ -13831,51 +13856,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 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13843 "Page.c"
+#line 13868 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13852 "Page.c"
+#line 13877 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13862 "Page.c"
+#line 13887 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/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 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 13879 "Page.c"
+#line 13904 "Page.c"
 }
 
 
@@ -13886,114 +13911,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	cairo_t* _tmp7_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13898 "Page.c"
+#line 13923 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_surface_t* _tmp2_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 13907 "Page.c"
+#line 13932 "Page.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 13914 "Page.c"
+#line 13939 "Page.c"
 	}
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/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 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/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 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13932 "Page.c"
+#line 13957 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 13941 "Page.c"
+#line 13966 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 13950 "Page.c"
+#line 13975 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 13959 "Page.c"
+#line 13984 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 13968 "Page.c"
+#line 13993 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13983 "Page.c"
+#line 14008 "Page.c"
 		gboolean _tmp2_ = FALSE;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 13989 "Page.c"
+#line 14014 "Page.c"
 	} else {
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 13993 "Page.c"
+#line 14018 "Page.c"
 	}
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 13997 "Page.c"
+#line 14022 "Page.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -14002,31 +14027,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 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 14030 "Page.c"
+#line 14055 "Page.c"
 	} else {
 		TransitionClock* _tmp11_ = NULL;
 		cairo_t* _tmp12_ = NULL;
@@ -14035,23 +14060,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		gboolean _tmp17_ = FALSE;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 14055 "Page.c"
+#line 14080 "Page.c"
 			cairo_t* _tmp18_ = NULL;
 			cairo_t* _tmp19_ = NULL;
 			Dimensions _tmp20_ = {0};
@@ -14066,56 +14091,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 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 14108 "Page.c"
+#line 14133 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 14119 "Page.c"
+#line 14144 "Page.c"
 }
 
 
@@ -14123,44 +14148,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/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 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14135 "Page.c"
+#line 14160 "Page.c"
 	}
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14145 "Page.c"
+#line 14170 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_ = NULL;
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14157 "Page.c"
+#line 14182 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14164 "Page.c"
+#line 14189 "Page.c"
 }
 
 
@@ -14203,171 +14228,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_ = NULL;
 	TransitionClock* _tmp98_ = NULL;
 	gboolean _tmp99_ = FALSE;
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2310 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14223 "Page.c"
+#line 14248 "Page.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14231 "Page.c"
+#line 14256 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_ = NULL;
 		GdkWindow* _tmp4_ = NULL;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14241 "Page.c"
+#line 14266 "Page.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14247 "Page.c"
+#line 14272 "Page.c"
 	}
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14273 "Page.c"
+#line 14298 "Page.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14280 "Page.c"
+#line 14305 "Page.c"
 	}
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14286 "Page.c"
+#line 14311 "Page.c"
 	}
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14312 "Page.c"
+#line 14337 "Page.c"
 	} else {
 		Dimensions _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14325 "Page.c"
+#line 14350 "Page.c"
 	}
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14333 "Page.c"
+#line 14358 "Page.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14341 "Page.c"
+#line 14366 "Page.c"
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14352 "Page.c"
+#line 14377 "Page.c"
 	}
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14360 "Page.c"
+#line 14385 "Page.c"
 	} else {
 		gboolean _tmp30_ = FALSE;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14367 "Page.c"
+#line 14392 "Page.c"
 	}
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14371 "Page.c"
+#line 14396 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
@@ -14392,155 +14417,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_ = 0;
 		Dimensions _tmp61_ = {0};
 		gint _tmp62_ = 0;
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14408 "Page.c"
+#line 14433 "Page.c"
 			gboolean _tmp37_ = FALSE;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14414 "Page.c"
+#line 14439 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14418 "Page.c"
+#line 14443 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14422 "Page.c"
+#line 14447 "Page.c"
 			Dimensions _tmp38_ = {0};
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14434 "Page.c"
+#line 14459 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14438 "Page.c"
+#line 14463 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14442 "Page.c"
+#line 14467 "Page.c"
 			Dimensions _tmp41_ = {0};
 			gint _tmp42_ = 0;
 			gint _tmp43_ = 0;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14454 "Page.c"
+#line 14479 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14458 "Page.c"
+#line 14483 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14462 "Page.c"
+#line 14487 "Page.c"
 			Dimensions _tmp44_ = {0};
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14468 "Page.c"
+#line 14493 "Page.c"
 		} else {
 			Dimensions _tmp45_ = {0};
 			Dimensions _tmp46_ = {0};
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14478 "Page.c"
+#line 14503 "Page.c"
 		}
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14524 "Page.c"
+#line 14549 "Page.c"
 	}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14532 "Page.c"
+#line 14557 "Page.c"
 	} else {
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14536 "Page.c"
+#line 14561 "Page.c"
 	}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14544 "Page.c"
+#line 14569 "Page.c"
 		GdkPixbuf* _tmp66_ = NULL;
 		GdkRectangle _tmp67_ = {0};
 		Dimensions _tmp68_ = {0};
@@ -14555,101 +14580,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_ = NULL;
 		SinglePhotoPageUpdateReason _tmp80_ = 0;
 		Dimensions _tmp81_ = {0};
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14581 "Page.c"
+#line 14606 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_ = FALSE;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14589 "Page.c"
+#line 14614 "Page.c"
 				GdkInterpType _tmp74_ = 0;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14595 "Page.c"
+#line 14620 "Page.c"
 			} else {
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14599 "Page.c"
+#line 14624 "Page.c"
 			}
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14605 "Page.c"
+#line 14630 "Page.c"
 			}
 		}
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14626 "Page.c"
+#line 14651 "Page.c"
 	}
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14636 "Page.c"
+#line 14661 "Page.c"
 		TransitionClock* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14645 "Page.c"
+#line 14670 "Page.c"
 	} else {
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14649 "Page.c"
+#line 14674 "Page.c"
 	}
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14653 "Page.c"
+#line 14678 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkRectangle _tmp88_ = {0};
@@ -14662,45 +14687,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_ = NULL;
 		SpitTransitionsDirection _tmp96_ = 0;
 		gint _tmp97_ = 0;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/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 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14694 "Page.c"
+#line 14719 "Page.c"
 	}
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14704 "Page.c"
+#line 14729 "Page.c"
 	}
 }
 
@@ -14721,65 +14746,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 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14783 "Page.c"
+#line 14808 "Page.c"
 }
 
 
@@ -14790,23 +14815,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 2415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14810 "Page.c"
+#line 14835 "Page.c"
 }
 
 
@@ -14815,11 +14840,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14823 "Page.c"
+#line 14848 "Page.c"
 }
 
 
@@ -14828,11 +14853,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14836 "Page.c"
+#line 14861 "Page.c"
 }
 
 
@@ -14849,266 +14874,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 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14865 "Page.c"
+#line 14890 "Page.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/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 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14896 "Page.c"
+#line 14921 "Page.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 14904 "Page.c"
+#line 14929 "Page.c"
 					GdkEventKey* _tmp10_ = NULL;
 					guint32 _tmp11_ = 0U;
-#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 14915 "Page.c"
+#line 14940 "Page.c"
 				}
-#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14919 "Page.c"
+#line 14944 "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 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14925 "Page.c"
+#line 14950 "Page.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 14933 "Page.c"
+#line 14958 "Page.c"
 					GdkEventKey* _tmp13_ = NULL;
 					guint32 _tmp14_ = 0U;
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 14944 "Page.c"
+#line 14969 "Page.c"
 				}
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14948 "Page.c"
+#line 14973 "Page.c"
 			}
 		}
 	} else {
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14954 "Page.c"
+#line 14979 "Page.c"
 			default:
 			{
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14961 "Page.c"
+#line 14986 "Page.c"
 			}
 		}
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 14973 "Page.c"
+#line 14998 "Page.c"
 	}
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 14977 "Page.c"
+#line 15002 "Page.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/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 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 14986 "Page.c"
+#line 15011 "Page.c"
 	} else {
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 14990 "Page.c"
+#line 15015 "Page.c"
 	}
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14996 "Page.c"
+#line 15021 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 15037 "Page.c"
+#line 15062 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GtkViewport* _tmp1_ = NULL;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 15084 "Page.c"
+#line 15109 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject* obj) {
 	SinglePhotoPage * self;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 15112 "Page.c"
+#line 15137 "Page.c"
 }
 
 
@@ -15125,32 +15150,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 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15131 "Page.c"
+#line 15156 "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 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15138 "Page.c"
+#line 15163 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15145 "Page.c"
+#line 15170 "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 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15154 "Page.c"
+#line 15179 "Page.c"
 }
 
 
@@ -15168,20 +15193,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15178 "Page.c"
+#line 15203 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15185 "Page.c"
+#line 15210 "Page.c"
 }
 
 
@@ -15202,117 +15227,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_ = NULL;
 	GtkWidget* _tmp18_ = NULL;
 	GtkWidget* _tmp19_ = NULL;
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15236 "Page.c"
+#line 15261 "Page.c"
 		GdkAtom _tmp7_ = 0U;
 		GdkAtom* _tmp8_ = NULL;
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15247 "Page.c"
+#line 15272 "Page.c"
 	}
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2504 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15253 "Page.c"
+#line 15278 "Page.c"
 		GdkAtom _tmp10_ = 0U;
 		GdkAtom* _tmp11_ = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15264 "Page.c"
+#line 15289 "Page.c"
 	}
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15272 "Page.c"
+#line 15297 "Page.c"
 		gint _tmp13_ = 0;
 		guchar* _tmp14_ = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/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 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15285 "Page.c"
+#line 15310 "Page.c"
 	}
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/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 2510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/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 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/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 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/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 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/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 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15309 "Page.c"
+#line 15334 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15316 "Page.c"
+#line 15341 "Page.c"
 }
 
 
@@ -15338,119 +15363,119 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 	guint8* _tmp31_ = NULL;
 	gint _tmp31__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2529: on_drag_begin (%s)", _tmp2_);
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2535: on_drag_begin (%s)", _tmp2_);
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15362 "Page.c"
+#line 15387 "Page.c"
 	} else {
 		Page* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15380 "Page.c"
+#line 15405 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15386 "Page.c"
+#line 15411 "Page.c"
 	} else {
 		ExporterUI* _tmp10_ = NULL;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15393 "Page.c"
+#line 15418 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15399 "Page.c"
+#line 15424 "Page.c"
 	}
-#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15425 "Page.c"
+#line 15450 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_ = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		GtkWidget* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15440 "Page.c"
-			goto __catch254_g_error;
+#line 15465 "Page.c"
+			goto __catch255_g_error;
 		}
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15451 "Page.c"
+#line 15476 "Page.c"
 	}
-	goto __finally254;
-	__catch254_g_error:
+	goto __finally255;
+	__catch255_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_ = NULL;
@@ -15458,58 +15483,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2543: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2549: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15482 "Page.c"
+#line 15507 "Page.c"
 	}
-	__finally254:
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally255:
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/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 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15495 "Page.c"
+#line 15520 "Page.c"
 	}
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15513 "Page.c"
+#line 15538 "Page.c"
 }
 
 
@@ -15520,61 +15545,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_ = NULL;
 	guint _tmp9_ = 0U;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2559: on_drag_data_get (%s)", _tmp2_);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2565: on_drag_data_get (%s)", _tmp2_);
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15546 "Page.c"
+#line 15571 "Page.c"
 	} else {
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15564 "Page.c"
+#line 15589 "Page.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15570 "Page.c"
+#line 15595 "Page.c"
 	}
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15578 "Page.c"
+#line 15603 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_ = NULL;
@@ -15610,83 +15635,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 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/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 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15656 "Page.c"
+#line 15681 "Page.c"
 				guchar* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15665 "Page.c"
+#line 15690 "Page.c"
 			} else {
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15669 "Page.c"
+#line 15694 "Page.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15673 "Page.c"
+#line 15698 "Page.c"
 				guchar* _tmp25_ = NULL;
 				gint _tmp25__length1 = 0;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15682 "Page.c"
+#line 15707 "Page.c"
 			} else {
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15686 "Page.c"
+#line 15711 "Page.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15690 "Page.c"
+#line 15715 "Page.c"
 				guchar* _tmp26_ = NULL;
 				gint _tmp26__length1 = 0;
 				gchar* _tmp27_ = NULL;
@@ -15694,103 +15719,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15720 "Page.c"
+#line 15745 "Page.c"
 			}
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15726 "Page.c"
+#line 15751 "Page.c"
 				GFile* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15737 "Page.c"
+#line 15762 "Page.c"
 			} else {
 				gchar* _tmp36_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15746 "Page.c"
+#line 15771 "Page.c"
 			}
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2578: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2584: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15764 "Page.c"
+#line 15789 "Page.c"
 			} else {
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15768 "Page.c"
+#line 15793 "Page.c"
 			}
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15790 "Page.c"
+#line 15815 "Page.c"
 		}
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15794 "Page.c"
+#line 15819 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_ = NULL;
@@ -15805,41 +15830,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 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15843 "Page.c"
+#line 15868 "Page.c"
 		}
 		default:
 		{
@@ -15847,30 +15872,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 			guint _tmp61_ = 0U;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2597: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2603: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15865 "Page.c"
+#line 15890 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 15874 "Page.c"
+#line 15899 "Page.c"
 }
 
 
@@ -15889,99 +15914,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2604: on_drag_end (%s)", _tmp2_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2610: on_drag_end (%s)", _tmp2_);
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 15911 "Page.c"
+#line 15936 "Page.c"
 	} else {
 		Page* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 15929 "Page.c"
+#line 15954 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15935 "Page.c"
+#line 15960 "Page.c"
 	} else {
 		GFile* _tmp11_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 15942 "Page.c"
+#line 15967 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15948 "Page.c"
+#line 15973 "Page.c"
 	} else {
 		ExporterUI* _tmp12_ = NULL;
-#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 15955 "Page.c"
+#line 15980 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15961 "Page.c"
+#line 15986 "Page.c"
 	}
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2611: Exporting to %s", _tmp15_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2617: Exporting to %s", _tmp15_);
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 15985 "Page.c"
+#line 16010 "Page.c"
 		Page* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		ViewCollection* _tmp22_ = NULL;
@@ -15994,56 +16019,56 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_ = NULL;
 		ExporterUI* _tmp30_ = NULL;
 		ExporterUI* _tmp31_ = NULL;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 16034 "Page.c"
+#line 16059 "Page.c"
 	} else {
 		const gchar* _tmp32_ = NULL;
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 16041 "Page.c"
+#line 16066 "Page.c"
 	}
-#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 16047 "Page.c"
+#line 16072 "Page.c"
 }
 
 
@@ -16054,271 +16079,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_ = NULL;
 	GtkDragResult _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2629: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2635: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 16082 "Page.c"
+#line 16107 "Page.c"
 	}
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 16092 "Page.c"
+#line 16117 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 16103 "Page.c"
+#line 16128 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 16110 "Page.c"
+#line 16135 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 16119 "Page.c"
+#line 16144 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 16129 "Page.c"
+#line 16154 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16133 "Page.c"
+#line 16158 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16141 "Page.c"
+#line 16166 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16148 "Page.c"
+#line 16173 "Page.c"
 		DragAndDropHandler* object;
 		object = collect_values[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16155 "Page.c"
+#line 16180 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 16159 "Page.c"
+#line 16184 "Page.c"
 		}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16163 "Page.c"
+#line 16188 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16167 "Page.c"
+#line 16192 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16171 "Page.c"
+#line 16196 "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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16182 "Page.c"
+#line 16207 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16188 "Page.c"
+#line 16213 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16192 "Page.c"
+#line 16217 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16196 "Page.c"
+#line 16221 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16200 "Page.c"
+#line 16225 "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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16214 "Page.c"
+#line 16239 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16223 "Page.c"
+#line 16248 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16243 "Page.c"
+#line 16268 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16247 "Page.c"
+#line 16272 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16253 "Page.c"
+#line 16278 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16272 "Page.c"
+#line 16297 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16276 "Page.c"
+#line 16301 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16282 "Page.c"
+#line 16307 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16294 "Page.c"
+#line 16319 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16307 "Page.c"
+#line 16332 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_ = NULL;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16322 "Page.c"
+#line 16347 "Page.c"
 		GtkWidget* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		GtkWidget* _tmp3_ = NULL;
@@ -16327,45 +16352,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 		guint _tmp6_ = 0U;
 		GtkWidget* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/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 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/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 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/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 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/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 16355 "Page.c"
+#line 16380 "Page.c"
 	}
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16369 "Page.c"
+#line 16394 "Page.c"
 }
 
 
@@ -16386,24 +16411,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16394 "Page.c"
+#line 16419 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16407 "Page.c"
+#line 16432 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 06454d8..bdeee6b 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -268,7 +268,11 @@ public abstract class Page : Gtk.ScrolledWindow {
     
     public virtual void switching_from() {
         in_view = false;
-        remove_actions(AppWindow.get_instance());
+        //remove_actions(AppWindow.get_instance());
+        var map = get_container() as GLib.ActionMap;
+        if (map != null) {
+            remove_actions(map);
+        }
         if (toolbar_path != null)
             toolbar = null;
     }
@@ -276,7 +280,10 @@ public abstract class Page : Gtk.ScrolledWindow {
     public virtual void switched_to() {
         in_view = true;
         add_ui();
-        add_actions(AppWindow.get_instance());
+        var map = get_container() as GLib.ActionMap;
+        if (map != null) {
+            add_actions(map);
+        }
         int selected_count = get_view().get_selected_count();
         int count = get_view().get_count();
         init_actions(selected_count, count);
@@ -563,13 +570,12 @@ public abstract class Page : Gtk.ScrolledWindow {
     }
     
     private void init_load_ui(string ui_filename) {
-        File ui_file = Resources.get_ui(ui_filename);
-        
+        var ui_resource = Resources.get_ui(ui_filename);
         try {
-            builder.add_from_file(ui_file.get_path());
+            builder.add_from_resource(ui_resource);
         } catch (Error err) {
-            AppWindow.error_message("Error loading UI file %s: %s".printf(
-                ui_file.get_path(), err.message));
+            AppWindow.error_message("Error loading UI resource %s: %s".printf(
+                ui_resource, err.message));
             Application.get_instance().panic();
         }
     }
diff --git a/src/Photo.c b/src/Photo.c
index 17e0e5d..b890199 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -483,6 +483,8 @@ typedef struct _MetadataDateTime MetadataDateTime;
 typedef struct _MetadataDateTimeClass MetadataDateTimeClass;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
 
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define PHOTO_TYPE_REIMPORT_MASTER_STATE (photo_reimport_master_state_get_type ())
 #define PHOTO_REIMPORT_MASTER_STATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState))
 #define PHOTO_REIMPORT_MASTER_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterStateClass))
@@ -1317,6 +1319,11 @@ typedef enum  {
 	IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE
 } ImportResult;
 
+typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
 struct _PhotoReimportMasterState {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -2069,8 +2076,8 @@ void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, P
 GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error);
 void photo_set_default_raw_developer (Photo* self, RawDeveloper d);
 void photo_set_raw_developer (Photo* self, RawDeveloper d);
-GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error);
 void photo_revert_to_master (Photo* self, gboolean notify);
+GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error);
 gboolean photo_set_orientation (Photo* self, Orientation orientation);
 void photo_discard_prefetched (Photo* self);
 RawDeveloper photo_get_raw_developer (Photo* self);
@@ -2138,6 +2145,8 @@ Rating photo_metadata_get_rating (PhotoMetadata* self);
 void photo_id_init (PhotoID *self, gint64 id);
 #define EVENT_ID_INVALID ((gint64) -1)
 void event_id_init (EventID *self, gint64 id);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
 void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error);
 ImportResult import_result_convert_error (GError* err, ImportResult default_result);
 void photo_create_pre_import (PhotoImportParams* params);
@@ -2875,14 +2884,14 @@ GType backing_fetch_mode_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2879 "Photo.c"
+#line 2888 "Photo.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 2886 "Photo.c"
+#line 2895 "Photo.c"
 }
 
 
@@ -2970,14 +2979,14 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file
 	self->thumbnails = _tmp13_;
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 2974 "Photo.c"
+#line 2983 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails);
-#line 2981 "Photo.c"
+#line 2990 "Photo.c"
 }
 
 
@@ -3024,21 +3033,21 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec
 	self->thumbnails = NULL;
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3028 "Photo.c"
+#line 3037 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) {
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id);
-#line 3035 "Photo.c"
+#line 3044 "Photo.c"
 }
 
 
 static void value_photo_import_params_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 3042 "Photo.c"
+#line 3051 "Photo.c"
 }
 
 
@@ -3047,7 +3056,7 @@ static void value_photo_import_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (value->data[0].v_pointer);
-#line 3051 "Photo.c"
+#line 3060 "Photo.c"
 	}
 }
 
@@ -3057,11 +3066,11 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer);
-#line 3061 "Photo.c"
+#line 3070 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3065 "Photo.c"
+#line 3074 "Photo.c"
 	}
 }
 
@@ -3069,37 +3078,37 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 static gpointer value_photo_import_params_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3073 "Photo.c"
+#line 3082 "Photo.c"
 }
 
 
 static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 3080 "Photo.c"
+#line 3089 "Photo.c"
 		PhotoImportParams* object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3087 "Photo.c"
+#line 3096 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3091 "Photo.c"
+#line 3100 "Photo.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3095 "Photo.c"
+#line 3104 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3099 "Photo.c"
+#line 3108 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3103 "Photo.c"
+#line 3112 "Photo.c"
 }
 
 
@@ -3110,25 +3119,25 @@ static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3114 "Photo.c"
+#line 3123 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 3120 "Photo.c"
+#line 3129 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3124 "Photo.c"
+#line 3133 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3128 "Photo.c"
+#line 3137 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3132 "Photo.c"
+#line 3141 "Photo.c"
 }
 
 
@@ -3142,7 +3151,7 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 3146 "Photo.c"
+#line 3155 "Photo.c"
 }
 
 
@@ -3151,7 +3160,7 @@ gpointer value_get_photo_import_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3155 "Photo.c"
+#line 3164 "Photo.c"
 }
 
 
@@ -3171,17 +3180,17 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_ref (value->data[0].v_pointer);
-#line 3175 "Photo.c"
+#line 3184 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3179 "Photo.c"
+#line 3188 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3185 "Photo.c"
+#line 3194 "Photo.c"
 	}
 }
 
@@ -3200,17 +3209,17 @@ void value_take_photo_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 3204 "Photo.c"
+#line 3213 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3208 "Photo.c"
+#line 3217 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3214 "Photo.c"
+#line 3223 "Photo.c"
 	}
 }
 
@@ -3220,7 +3229,7 @@ static void photo_import_params_class_init (PhotoImportParamsClass * klass) {
 	photo_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize;
-#line 3224 "Photo.c"
+#line 3233 "Photo.c"
 }
 
 
@@ -3236,7 +3245,7 @@ static void photo_import_params_instance_init (PhotoImportParams * self) {
 	self->keywords = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 3240 "Photo.c"
+#line 3249 "Photo.c"
 }
 
 
@@ -3262,7 +3271,7 @@ static void photo_import_params_finalize (PhotoImportParams* obj) {
 	_photo_row_unref0 (self->row);
 #line 36 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->keywords);
-#line 3266 "Photo.c"
+#line 3275 "Photo.c"
 }
 
 
@@ -3287,7 +3296,7 @@ gpointer photo_import_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 3291 "Photo.c"
+#line 3300 "Photo.c"
 }
 
 
@@ -3300,7 +3309,7 @@ void photo_import_params_unref (gpointer instance) {
 		PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3304 "Photo.c"
+#line 3313 "Photo.c"
 	}
 }
 
@@ -3311,7 +3320,7 @@ PhotoTransformationState* photo_transformation_state_construct (GType object_typ
 	self = (PhotoTransformationState*) g_object_new (object_type, NULL);
 #line 72 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3315 "Photo.c"
+#line 3324 "Photo.c"
 }
 
 
@@ -3326,14 +3335,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3330 "Photo.c"
+#line 3339 "Photo.c"
 }
 
 
 static void photo_transformation_state_real_broken (PhotoTransformationState* self) {
 #line 69 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = TRUE;
-#line 3337 "Photo.c"
+#line 3346 "Photo.c"
 }
 
 
@@ -3348,7 +3357,7 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass
 	G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize;
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3352 "Photo.c"
+#line 3361 "Photo.c"
 }
 
 
@@ -3357,7 +3366,7 @@ static void photo_transformation_state_instance_init (PhotoTransformationState *
 	self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self);
 #line 64 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = FALSE;
-#line 3361 "Photo.c"
+#line 3370 "Photo.c"
 }
 
 
@@ -3367,7 +3376,7 @@ static void photo_transformation_state_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj);
-#line 3371 "Photo.c"
+#line 3380 "Photo.c"
 }
 
 
@@ -3389,7 +3398,7 @@ gboolean rating_can_increase (Rating self) {
 	result = self < RATING_FIVE;
 #line 90 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3393 "Photo.c"
+#line 3402 "Photo.c"
 }
 
 
@@ -3399,7 +3408,7 @@ gboolean rating_can_decrease (Rating self) {
 	result = self > RATING_REJECTED;
 #line 94 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3403 "Photo.c"
+#line 3412 "Photo.c"
 }
 
 
@@ -3410,17 +3419,17 @@ gboolean rating_is_valid (Rating self) {
 	if (self >= RATING_REJECTED) {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self <= RATING_FIVE;
-#line 3414 "Photo.c"
+#line 3423 "Photo.c"
 	} else {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 3418 "Photo.c"
+#line 3427 "Photo.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3424 "Photo.c"
+#line 3433 "Photo.c"
 }
 
 
@@ -3434,17 +3443,17 @@ Rating rating_increase (Rating self) {
 	if (_tmp1_) {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self + 1;
-#line 3438 "Photo.c"
+#line 3447 "Photo.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3442 "Photo.c"
+#line 3451 "Photo.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3448 "Photo.c"
+#line 3457 "Photo.c"
 }
 
 
@@ -3458,17 +3467,17 @@ Rating rating_decrease (Rating self) {
 	if (_tmp1_) {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self - 1;
-#line 3462 "Photo.c"
+#line 3471 "Photo.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3466 "Photo.c"
+#line 3475 "Photo.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3472 "Photo.c"
+#line 3481 "Photo.c"
 }
 
 
@@ -3478,73 +3487,73 @@ gint rating_serialize (Rating self) {
 	switch (self) {
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_REJECTED:
-#line 3482 "Photo.c"
+#line 3491 "Photo.c"
 		{
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = -1;
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3488 "Photo.c"
+#line 3497 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_UNRATED:
-#line 3492 "Photo.c"
+#line 3501 "Photo.c"
 		{
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 0;
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3498 "Photo.c"
+#line 3507 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_ONE:
-#line 3502 "Photo.c"
+#line 3511 "Photo.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 1;
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3508 "Photo.c"
+#line 3517 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_TWO:
-#line 3512 "Photo.c"
+#line 3521 "Photo.c"
 		{
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 2;
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3518 "Photo.c"
+#line 3527 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_THREE:
-#line 3522 "Photo.c"
+#line 3531 "Photo.c"
 		{
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 3;
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3528 "Photo.c"
+#line 3537 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FOUR:
-#line 3532 "Photo.c"
+#line 3541 "Photo.c"
 		{
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 4;
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3538 "Photo.c"
+#line 3547 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FIVE:
-#line 3542 "Photo.c"
+#line 3551 "Photo.c"
 		{
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 5;
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3548 "Photo.c"
+#line 3557 "Photo.c"
 		}
 		default:
 		{
@@ -3552,7 +3561,7 @@ gint rating_serialize (Rating self) {
 			result = 0;
 #line 126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3556 "Photo.c"
+#line 3565 "Photo.c"
 		}
 	}
 }
@@ -3570,7 +3579,7 @@ Rating rating_unserialize (gint value) {
 		result = RATING_FIVE;
 #line 132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 3574 "Photo.c"
+#line 3583 "Photo.c"
 	} else {
 		gint _tmp1_ = 0;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3581,7 +3590,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_REJECTED;
 #line 134 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3585 "Photo.c"
+#line 3594 "Photo.c"
 		}
 	}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3590,73 +3599,73 @@ Rating rating_unserialize (gint value) {
 	switch (_tmp2_) {
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case -1:
-#line 3594 "Photo.c"
+#line 3603 "Photo.c"
 		{
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_REJECTED;
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3600 "Photo.c"
+#line 3609 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 0:
-#line 3604 "Photo.c"
+#line 3613 "Photo.c"
 		{
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_UNRATED;
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3610 "Photo.c"
+#line 3619 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 1:
-#line 3614 "Photo.c"
+#line 3623 "Photo.c"
 		{
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_ONE;
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3620 "Photo.c"
+#line 3629 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 2:
-#line 3624 "Photo.c"
+#line 3633 "Photo.c"
 		{
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_TWO;
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3630 "Photo.c"
+#line 3639 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 3:
-#line 3634 "Photo.c"
+#line 3643 "Photo.c"
 		{
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_THREE;
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3640 "Photo.c"
+#line 3649 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 4:
-#line 3644 "Photo.c"
+#line 3653 "Photo.c"
 		{
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FOUR;
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3650 "Photo.c"
+#line 3659 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 5:
-#line 3654 "Photo.c"
+#line 3663 "Photo.c"
 		{
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FIVE;
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3660 "Photo.c"
+#line 3669 "Photo.c"
 		}
 		default:
 		{
@@ -3664,7 +3673,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_UNRATED;
 #line 152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3668 "Photo.c"
+#line 3677 "Photo.c"
 		}
 	}
 }
@@ -3691,7 +3700,7 @@ gboolean photo_exception_prohibits (PhotoException self, PhotoException exceptio
 	result = (self & _tmp0_) != 0;
 #line 228 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3695 "Photo.c"
+#line 3704 "Photo.c"
 }
 
 
@@ -3704,7 +3713,7 @@ gboolean photo_exception_allows (PhotoException self, PhotoException exception)
 	result = (self & _tmp0_) == 0;
 #line 232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3708 "Photo.c"
+#line 3717 "Photo.c"
 }
 
 
@@ -3723,14 +3732,14 @@ GType photo_exception_get_type (void) {
 static gpointer _photo_row_ref0 (gpointer self) {
 #line 400 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_row_ref (self) : NULL;
-#line 3727 "Photo.c"
+#line 3736 "Photo.c"
 }
 
 
 static gpointer _backing_photo_row_ref0 (gpointer self) {
 #line 421 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? backing_photo_row_ref (self) : NULL;
-#line 3734 "Photo.c"
+#line 3743 "Photo.c"
 }
 
 
@@ -3847,7 +3856,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp22_ = basename;
 #line 412 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 3851 "Photo.c"
+#line 3860 "Photo.c"
 		const gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3858,7 +3867,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp24_;
-#line 3862 "Photo.c"
+#line 3871 "Photo.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = self->priv->file_title;
@@ -3866,7 +3875,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp26_ = is_string_empty (_tmp25_);
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_) {
-#line 3870 "Photo.c"
+#line 3879 "Photo.c"
 		PhotoRow* _tmp27_ = NULL;
 		BackingPhotoRow* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -3883,7 +3892,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 416 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp30_;
-#line 3887 "Photo.c"
+#line 3896 "Photo.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = row;
@@ -3893,7 +3902,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp33_ = _tmp32_.id;
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_ != BACKING_PHOTO_ID_INVALID) {
-#line 3897 "Photo.c"
+#line 3906 "Photo.c"
 		BackingPhotoRow* e = NULL;
 		PhotoRow* _tmp34_ = NULL;
 		BackingPhotoID _tmp35_ = {0};
@@ -3911,7 +3920,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp37_ = e;
 #line 420 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_ != NULL) {
-#line 3915 "Photo.c"
+#line 3924 "Photo.c"
 			BackingPhotoRow* _tmp38_ = NULL;
 			BackingPhotoRow* _tmp39_ = NULL;
 			PhotoBackingReaders* _tmp40_ = NULL;
@@ -3944,7 +3953,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_photo_file_adapter_unref0 (_tmp40_->editable);
 #line 422 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_->editable = _tmp45_;
-#line 3948 "Photo.c"
+#line 3957 "Photo.c"
 		} else {
 			{
 				PhotoTable* _tmp46_ = NULL;
@@ -3964,8 +3973,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3968 "Photo.c"
-						goto __catch255_database_error;
+#line 3977 "Photo.c"
+						goto __catch256_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -3977,11 +3986,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					return NULL;
-#line 3981 "Photo.c"
+#line 3990 "Photo.c"
 				}
 			}
-			goto __finally255;
-			__catch255_database_error:
+			goto __finally256;
+			__catch256_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3990,9 +3999,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_inner_error_ = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3994 "Photo.c"
+#line 4003 "Photo.c"
 			}
-			__finally255:
+			__finally256:
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4005,15 +4014,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4009 "Photo.c"
+#line 4018 "Photo.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_internal_remove_all_transformations (self, FALSE);
-#line 4013 "Photo.c"
+#line 4022 "Photo.c"
 		}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (e);
-#line 4017 "Photo.c"
+#line 4026 "Photo.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = row;
@@ -4023,7 +4032,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp51_ = _tmp50_->file_format;
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4027 "Photo.c"
+#line 4036 "Photo.c"
 		GeeHashMap* _tmp52_ = NULL;
 		gint _tmp53_ = 0;
 		RawDeveloper* _tmp54_ = NULL;
@@ -4035,7 +4044,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		self->priv->developments = _tmp52_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = raw_developer_as_array (&_tmp53_);
-#line 4039 "Photo.c"
+#line 4048 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4047,11 +4056,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			d_collection_length1 = _tmp53_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) {
-#line 4051 "Photo.c"
+#line 4060 "Photo.c"
 				RawDeveloper d = 0;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4055 "Photo.c"
+#line 4064 "Photo.c"
 				{
 					BackingPhotoID id = {0};
 					PhotoRow* _tmp55_ = NULL;
@@ -4079,7 +4088,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					_tmp60_ = _tmp59_.id;
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp60_ != BACKING_PHOTO_ID_INVALID) {
-#line 4083 "Photo.c"
+#line 4092 "Photo.c"
 						BackingPhotoRow* bpr = NULL;
 						BackingPhotoID _tmp61_ = {0};
 						BackingPhotoRow* _tmp62_ = NULL;
@@ -4094,7 +4103,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 						_tmp63_ = bpr;
 #line 443 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp63_ != NULL) {
-#line 4098 "Photo.c"
+#line 4107 "Photo.c"
 							GeeHashMap* _tmp64_ = NULL;
 							RawDeveloper _tmp65_ = 0;
 							BackingPhotoRow* _tmp66_ = NULL;
@@ -4106,17 +4115,17 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 							_tmp66_ = bpr;
 #line 444 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_);
-#line 4110 "Photo.c"
+#line 4119 "Photo.c"
 						}
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bpr);
-#line 4114 "Photo.c"
+#line 4123 "Photo.c"
 					}
 				}
 			}
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4120 "Photo.c"
+#line 4129 "Photo.c"
 		}
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4127,7 +4136,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp70_ = _tmp69_->file_format;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4131 "Photo.c"
+#line 4140 "Photo.c"
 		GeeHashMap* _tmp71_ = NULL;
 		PhotoRow* _tmp72_ = NULL;
 		RawDeveloper _tmp73_ = 0;
@@ -4142,15 +4151,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_));
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = _tmp74_;
-#line 4146 "Photo.c"
+#line 4155 "Photo.c"
 	} else {
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = FALSE;
-#line 4150 "Photo.c"
+#line 4159 "Photo.c"
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_) {
-#line 4154 "Photo.c"
+#line 4163 "Photo.c"
 		BackingPhotoRow* r = NULL;
 		GeeHashMap* _tmp75_ = NULL;
 		PhotoRow* _tmp76_ = NULL;
@@ -4190,7 +4199,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp79_->developer = _tmp84_;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (r);
-#line 4194 "Photo.c"
+#line 4203 "Photo.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = self->priv->readers;
@@ -4198,7 +4207,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp86_ = _tmp85_->editable;
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_ != NULL) {
-#line 4202 "Photo.c"
+#line 4211 "Photo.c"
 		BackingPhotoRow* _tmp87_ = NULL;
 		BackingPhotoRow* _tmp88_ = NULL;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4209,7 +4218,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_backing_photo_row_unref0 (self->backing_photo_row);
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->backing_photo_row = _tmp88_;
-#line 4213 "Photo.c"
+#line 4222 "Photo.c"
 	} else {
 		PhotoRow* _tmp89_ = NULL;
 		BackingPhotoRow* _tmp90_ = NULL;
@@ -4222,7 +4231,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp91_ = _tmp90_->file_format;
 #line 458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) {
-#line 4226 "Photo.c"
+#line 4235 "Photo.c"
 			PhotoRow* _tmp92_ = NULL;
 			BackingPhotoRow* _tmp93_ = NULL;
 			BackingPhotoRow* _tmp94_ = NULL;
@@ -4236,7 +4245,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_backing_photo_row_unref0 (self->backing_photo_row);
 #line 459 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->backing_photo_row = _tmp94_;
-#line 4240 "Photo.c"
+#line 4249 "Photo.c"
 		} else {
 			GeeHashMap* _tmp95_ = NULL;
 			PhotoRow* _tmp96_ = NULL;
@@ -4252,7 +4261,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_));
 #line 463 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp98_) {
-#line 4256 "Photo.c"
+#line 4265 "Photo.c"
 				GeeHashMap* _tmp99_ = NULL;
 				PhotoRow* _tmp100_ = NULL;
 				RawDeveloper _tmp101_ = 0;
@@ -4269,7 +4278,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 464 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = (BackingPhotoRow*) _tmp102_;
-#line 4273 "Photo.c"
+#line 4282 "Photo.c"
 			} else {
 				PhotoRow* _tmp103_ = NULL;
 				BackingPhotoRow* _tmp104_ = NULL;
@@ -4284,7 +4293,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 467 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = _tmp105_;
-#line 4288 "Photo.c"
+#line 4297 "Photo.c"
 			}
 		}
 	}
@@ -4298,7 +4307,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_g_free0 (basename);
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 4302 "Photo.c"
+#line 4311 "Photo.c"
 }
 
 
@@ -4310,7 +4319,7 @@ void photo_init_photo (void) {
 	_g_object_unref0 (photo_source_pixbuf_cache);
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_source_pixbuf_cache = _tmp0_;
-#line 4314 "Photo.c"
+#line 4323 "Photo.c"
 }
 
 
@@ -4324,7 +4333,7 @@ void photo_terminate_photo (void) {
 	_tmp0_ = photo_discard_source_id;
 #line 481 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 4328 "Photo.c"
+#line 4337 "Photo.c"
 		guint _tmp1_ = 0U;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_discard_source_id;
@@ -4332,7 +4341,7 @@ void photo_terminate_photo (void) {
 		g_source_remove (_tmp1_);
 #line 483 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_discard_source_id = (guint) 0;
-#line 4336 "Photo.c"
+#line 4345 "Photo.c"
 	}
 }
 
@@ -4350,7 +4359,7 @@ static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, G
 	_tmp1_ = new_file;
 #line 488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-replaced", _tmp0_, _tmp1_);
-#line 4354 "Photo.c"
+#line 4363 "Photo.c"
 }
 
 
@@ -4359,14 +4368,14 @@ void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_fi
 	g_return_if_fail (IS_PHOTO (self));
 #line 487 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file);
-#line 4363 "Photo.c"
+#line 4372 "Photo.c"
 }
 
 
 static void photo_real_notify_raw_development_modified (Photo* self) {
 #line 492 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "raw-development-modified");
-#line 4370 "Photo.c"
+#line 4379 "Photo.c"
 }
 
 
@@ -4375,14 +4384,14 @@ void photo_notify_raw_development_modified (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 491 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_raw_development_modified (self);
-#line 4379 "Photo.c"
+#line 4388 "Photo.c"
 }
 
 
 static void photo_real_notify_baseline_replaced (Photo* self) {
 #line 496 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-replaced");
-#line 4386 "Photo.c"
+#line 4395 "Photo.c"
 }
 
 
@@ -4391,7 +4400,7 @@ void photo_notify_baseline_replaced (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 495 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_replaced (self);
-#line 4395 "Photo.c"
+#line 4404 "Photo.c"
 }
 
 
@@ -4403,7 +4412,7 @@ static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* met
 	_tmp0_ = metadata;
 #line 500 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "master-reimported", _tmp0_);
-#line 4407 "Photo.c"
+#line 4416 "Photo.c"
 }
 
 
@@ -4412,7 +4421,7 @@ void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 499 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata);
-#line 4416 "Photo.c"
+#line 4425 "Photo.c"
 }
 
 
@@ -4424,7 +4433,7 @@ static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* m
 	_tmp0_ = metadata;
 #line 504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-reimported", _tmp0_);
-#line 4428 "Photo.c"
+#line 4437 "Photo.c"
 }
 
 
@@ -4433,7 +4442,7 @@ void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 503 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata);
-#line 4437 "Photo.c"
+#line 4446 "Photo.c"
 }
 
 
@@ -4445,7 +4454,7 @@ static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* met
 	_tmp0_ = metadata;
 #line 508 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "source-reimported", _tmp0_);
-#line 4449 "Photo.c"
+#line 4458 "Photo.c"
 }
 
 
@@ -4454,7 +4463,7 @@ void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 507 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata);
-#line 4458 "Photo.c"
+#line 4467 "Photo.c"
 }
 
 
@@ -4466,7 +4475,7 @@ static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* m
 	_tmp0_ = metadata;
 #line 512 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_);
-#line 4470 "Photo.c"
+#line 4479 "Photo.c"
 }
 
 
@@ -4475,7 +4484,7 @@ void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 511 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata);
-#line 4479 "Photo.c"
+#line 4488 "Photo.c"
 }
 
 
@@ -4496,14 +4505,14 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	ret = TRUE;
 #line 517 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = NULL;
-#line 4500 "Photo.c"
+#line 4509 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 4507 "Photo.c"
+#line 4516 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -4513,7 +4522,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp2_ = _tmp1_->editable;
 #line 519 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 4517 "Photo.c"
+#line 4526 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -4527,17 +4536,17 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 				_g_object_unref0 (file);
 #line 520 "/home/jens/Source/shotwell/src/Photo.vala"
 				file = _tmp5_;
-#line 4531 "Photo.c"
+#line 4540 "Photo.c"
 			}
 		}
-		__finally256:
+		__finally257:
 		{
 			PhotoBackingReaders* _tmp6_ = NULL;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 4541 "Photo.c"
+#line 4550 "Photo.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -4547,7 +4556,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 4551 "Photo.c"
+#line 4560 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4556,12 +4565,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp7_ = photo_get_master_file_format (self);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4560 "Photo.c"
+#line 4569 "Photo.c"
 		gint _tmp8_ = 0;
 		RawDeveloper* _tmp9_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = raw_developer_as_array (&_tmp8_);
-#line 4565 "Photo.c"
+#line 4574 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4573,30 +4582,30 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			d_collection_length1 = _tmp8_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) {
-#line 4577 "Photo.c"
+#line 4586 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4581 "Photo.c"
+#line 4590 "Photo.c"
 				{
 					RawDeveloper _tmp10_ = 0;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = d;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_delete_raw_development (self, _tmp10_);
-#line 4588 "Photo.c"
+#line 4597 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4593 "Photo.c"
+#line 4602 "Photo.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = file;
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 4600 "Photo.c"
+#line 4609 "Photo.c"
 		{
 			gboolean _tmp12_ = FALSE;
 			GFile* _tmp13_ = NULL;
@@ -4609,15 +4618,15 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp12_ = _tmp14_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4613 "Photo.c"
-				goto __catch257_g_error;
+#line 4622 "Photo.c"
+				goto __catch258_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp12_;
-#line 4618 "Photo.c"
+#line 4627 "Photo.c"
 		}
-		goto __finally257;
-		__catch257_g_error:
+		goto __finally258;
+		__catch258_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp15_ = NULL;
@@ -4655,9 +4664,9 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_free0 (_tmp17_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4659 "Photo.c"
+#line 4668 "Photo.c"
 		}
-		__finally257:
+		__finally258:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4666,7 +4675,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 4670 "Photo.c"
+#line 4679 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4681,21 +4690,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 		_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 4685 "Photo.c"
+#line 4694 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 4689 "Photo.c"
+#line 4698 "Photo.c"
 		gboolean _tmp25_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ret;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp25_;
-#line 4695 "Photo.c"
+#line 4704 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 4699 "Photo.c"
+#line 4708 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp22_;
@@ -4703,7 +4712,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4707 "Photo.c"
+#line 4716 "Photo.c"
 }
 
 
@@ -4728,11 +4737,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		result = NULL;
 #line 549 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4732 "Photo.c"
+#line 4741 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4736 "Photo.c"
+#line 4745 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
 		BackingPhotoTable* _tmp3_ = NULL;
@@ -4759,8 +4768,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4763 "Photo.c"
-				goto __catch258_database_error;
+#line 4772 "Photo.c"
+				goto __catch259_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4770,7 +4779,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4774 "Photo.c"
+#line 4783 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4782,10 +4791,10 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		backing_row = _tmp8_;
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp2_);
-#line 4786 "Photo.c"
+#line 4795 "Photo.c"
 	}
-	goto __finally258;
-	__catch258_database_error:
+	goto __finally259;
+	__catch259_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -4810,9 +4819,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_g_free0 (_tmp10_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 4814 "Photo.c"
+#line 4823 "Photo.c"
 	}
-	__finally258:
+	__finally259:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4823,13 +4832,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		g_clear_error (&_inner_error_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 4827 "Photo.c"
+#line 4836 "Photo.c"
 	}
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = backing_row;
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 4833 "Photo.c"
+#line 4842 "Photo.c"
 		{
 			BackingPhotoTable* _tmp14_ = NULL;
 			BackingPhotoTable* _tmp15_ = NULL;
@@ -4848,8 +4857,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4852 "Photo.c"
-					goto __catch259_database_error;
+#line 4861 "Photo.c"
+					goto __catch260_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4859,11 +4868,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 				g_clear_error (&_inner_error_);
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4863 "Photo.c"
+#line 4872 "Photo.c"
 			}
 		}
-		goto __finally259;
-		__catch259_database_error:
+		goto __finally260;
+		__catch260_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4872,9 +4881,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			_inner_error_ = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4876 "Photo.c"
+#line 4885 "Photo.c"
 		}
-		__finally259:
+		__finally260:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4885,7 +4894,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4889 "Photo.c"
+#line 4898 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4893,13 +4902,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_backing_photo_row_unref0 (backing_row);
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4897 "Photo.c"
+#line 4906 "Photo.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing_row;
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4903 "Photo.c"
+#line 4912 "Photo.c"
 }
 
 
@@ -4908,14 +4917,14 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4912 "Photo.c"
+#line 4921 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 4919 "Photo.c"
+#line 4928 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashMap* _tmp2_ = NULL;
@@ -4929,7 +4938,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 			_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_));
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_) {
-#line 4933 "Photo.c"
+#line 4942 "Photo.c"
 				GeeHashMap* _tmp5_ = NULL;
 				RawDeveloper _tmp6_ = 0;
 				gpointer _tmp7_ = NULL;
@@ -4952,35 +4961,35 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp10_;
 #line 575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp8_);
-#line 4956 "Photo.c"
+#line 4965 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 4960 "Photo.c"
+#line 4969 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 4964 "Photo.c"
+#line 4973 "Photo.c"
 			{
 				GeeHashMap* _tmp11_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 4971 "Photo.c"
+#line 4980 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 4975 "Photo.c"
+#line 4984 "Photo.c"
 		}
-		__finally260:
+		__finally261:
 		{
 			GeeHashMap* _tmp12_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 4984 "Photo.c"
+#line 4993 "Photo.c"
 		}
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4988,7 +4997,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 		g_clear_error (&_inner_error_);
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 4992 "Photo.c"
+#line 5001 "Photo.c"
 	}
 }
 
@@ -4999,14 +5008,14 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 5003 "Photo.c"
+#line 5012 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5010 "Photo.c"
+#line 5019 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -5021,28 +5030,28 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			if (_tmp3_) {
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 5025 "Photo.c"
+#line 5034 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5032 "Photo.c"
+#line 5041 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5036 "Photo.c"
+#line 5045 "Photo.c"
 			}
 		}
-		__finally261:
+		__finally262:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5046 "Photo.c"
+#line 5055 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5052,7 +5061,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 5056 "Photo.c"
+#line 5065 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5061,27 +5070,27 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	switch (_tmp6_) {
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5065 "Photo.c"
+#line 5074 "Photo.c"
 		{
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = TRUE;
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5071 "Photo.c"
+#line 5080 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5075 "Photo.c"
+#line 5084 "Photo.c"
 		{
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5081 "Photo.c"
+#line 5090 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5085 "Photo.c"
+#line 5094 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -5096,8 +5105,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				meta = _tmp7_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5100 "Photo.c"
-					goto __catch262_g_error;
+#line 5109 "Photo.c"
+					goto __catch263_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = meta;
@@ -5109,7 +5118,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_tmp10_ = num_previews;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ > ((guint) 0)) {
-#line 5113 "Photo.c"
+#line 5122 "Photo.c"
 					PhotoPreview* prev = NULL;
 					PhotoMetadata* _tmp11_ = NULL;
 					guint _tmp12_ = 0U;
@@ -5145,7 +5154,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 603 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5149 "Photo.c"
+#line 5158 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = prev;
@@ -5163,7 +5172,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_tmp21_ = _tmp20_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp19_ > _tmp21_) {
-#line 5167 "Photo.c"
+#line 5176 "Photo.c"
 						Dimensions _tmp22_ = {0};
 						gint _tmp23_ = 0;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5172,7 +5181,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp23_ = _tmp22_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = _tmp23_;
-#line 5176 "Photo.c"
+#line 5185 "Photo.c"
 					} else {
 						Dimensions _tmp24_ = {0};
 						gint _tmp25_ = 0;
@@ -5182,7 +5191,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp25_ = _tmp24_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = _tmp25_;
-#line 5186 "Photo.c"
+#line 5195 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					preview_major_axis = _tmp17_;
@@ -5198,7 +5207,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 610 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5202 "Photo.c"
+#line 5211 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5208,7 +5217,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_media_metadata_unref0 (meta);
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 5212 "Photo.c"
+#line 5221 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5216,10 +5225,10 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_media_metadata_unref0 (meta);
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5220 "Photo.c"
+#line 5229 "Photo.c"
 			}
-			goto __finally262;
-			__catch262_g_error:
+			goto __finally263;
+			__catch263_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp27_ = NULL;
@@ -5236,9 +5245,9 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp28_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 5240 "Photo.c"
+#line 5249 "Photo.c"
 			}
-			__finally262:
+			__finally263:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5247,19 +5256,19 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 5251 "Photo.c"
+#line 5260 "Photo.c"
 			}
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5257 "Photo.c"
+#line 5266 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5263 "Photo.c"
+#line 5272 "Photo.c"
 		}
 	}
 }
@@ -5290,7 +5299,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		g_propagate_error (error, _inner_error_);
 #line 632 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5294 "Photo.c"
+#line 5303 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp3_ = NULL;
@@ -5298,7 +5307,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		_tmp3_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5302 "Photo.c"
+#line 5311 "Photo.c"
 		{
 			GeeHashMap* _tmp4_ = NULL;
 			RawDeveloper _tmp5_ = 0;
@@ -5311,16 +5320,16 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			_tmp6_ = bpr;
 #line 634 "/home/jens/Source/shotwell/src/Photo.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_);
-#line 5315 "Photo.c"
+#line 5324 "Photo.c"
 		}
-		__finally263:
+		__finally264:
 		{
 			GeeHashMap* _tmp7_ = NULL;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5324 "Photo.c"
+#line 5333 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5328,7 +5337,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			g_propagate_error (error, _inner_error_);
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 5332 "Photo.c"
+#line 5341 "Photo.c"
 		}
 	}
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5339,7 +5348,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_);
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp9_);
-#line 5343 "Photo.c"
+#line 5352 "Photo.c"
 }
 
 
@@ -5412,7 +5421,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 642 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5416 "Photo.c"
+#line 5425 "Photo.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
@@ -5442,7 +5451,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 648 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5446 "Photo.c"
+#line 5455 "Photo.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
@@ -5456,7 +5465,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	if (_tmp13_ == NULL) {
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 5460 "Photo.c"
+#line 5469 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
@@ -5466,7 +5475,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp15_;
-#line 5470 "Photo.c"
+#line 5479 "Photo.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
@@ -5480,7 +5489,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 654 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5484 "Photo.c"
+#line 5493 "Photo.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
@@ -5512,7 +5521,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_tmp27_ = _tmp26_->metadata;
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp27_ != NULL) {
-#line 5516 "Photo.c"
+#line 5525 "Photo.c"
 		DetectedPhotoInformation* _tmp28_ = NULL;
 		PhotoMetadata* _tmp29_ = NULL;
 		Orientation _tmp30_ = 0;
@@ -5524,11 +5533,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp30_ = photo_metadata_get_orientation (_tmp29_);
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp30_;
-#line 5528 "Photo.c"
+#line 5537 "Photo.c"
 	} else {
 #line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5532 "Photo.c"
+#line 5541 "Photo.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
@@ -5558,7 +5567,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5562 "Photo.c"
+#line 5571 "Photo.c"
 	}
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
@@ -5590,7 +5599,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5594 "Photo.c"
+#line 5603 "Photo.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -5600,7 +5609,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_g_object_unref0 (info);
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5604 "Photo.c"
+#line 5613 "Photo.c"
 }
 
 
@@ -5621,7 +5630,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 	switch (_tmp0_) {
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5625 "Photo.c"
+#line 5634 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
@@ -5661,8 +5670,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp6_;
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5665 "Photo.c"
-					goto __catch264_g_error;
+#line 5674 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
@@ -5674,14 +5683,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				bps = _tmp7_;
 #line 679 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5678 "Photo.c"
+#line 5687 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp8_ = NULL;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 5685 "Photo.c"
+#line 5694 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
@@ -5695,8 +5704,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_tmp9_ = _tmp11_;
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5699 "Photo.c"
-							goto __finally265;
+#line 5708 "Photo.c"
+							goto __finally266;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
@@ -5708,16 +5717,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						pix = _tmp12_;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp9_);
-#line 5712 "Photo.c"
+#line 5721 "Photo.c"
 					}
-					__finally265:
+					__finally266:
 					{
 						PhotoBackingReaders* _tmp13_ = NULL;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5721 "Photo.c"
+#line 5730 "Photo.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5725,8 +5734,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_object_unref0 (pix);
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (_tmp1_);
-#line 5729 "Photo.c"
-						goto __catch264_g_error;
+#line 5738 "Photo.c"
+						goto __catch265_g_error;
 					}
 				}
 #line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5739,14 +5748,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5743 "Photo.c"
+#line 5752 "Photo.c"
 					{
 						gboolean _tmp15_ = FALSE;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp15_) {
-#line 5750 "Photo.c"
+#line 5759 "Photo.c"
 							{
 								RawDeveloper _tmp16_ = 0;
 								BackingPhotoRow* _tmp17_ = NULL;
@@ -5758,15 +5767,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5762 "Photo.c"
-									goto __catch266_g_error;
+#line 5771 "Photo.c"
+									goto __catch267_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5767 "Photo.c"
+#line 5776 "Photo.c"
 							}
-							goto __finally266;
-							__catch266_g_error:
+							goto __finally267;
+							__catch267_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp18_ = NULL;
@@ -5783,13 +5792,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 5787 "Photo.c"
+#line 5796 "Photo.c"
 							}
-							__finally266:
+							__finally267:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5792 "Photo.c"
-								goto __catch264_g_error;
+#line 5801 "Photo.c"
+								goto __catch265_g_error;
 							}
 						}
 					}
@@ -5797,7 +5806,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 5801 "Photo.c"
+#line 5810 "Photo.c"
 				}
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = bps;
@@ -5813,8 +5822,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5817 "Photo.c"
-					goto __catch264_g_error;
+#line 5826 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = writer;
@@ -5830,8 +5839,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5834 "Photo.c"
-					goto __catch264_g_error;
+#line 5843 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -5847,8 +5856,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 708 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5851 "Photo.c"
-					goto __catch264_g_error;
+#line 5860 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = bps;
@@ -5868,8 +5877,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5872 "Photo.c"
-					goto __catch264_g_error;
+#line 5881 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = mwriter;
@@ -5889,8 +5898,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5893 "Photo.c"
-					goto __catch264_g_error;
+#line 5902 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -5902,10 +5911,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_g_object_unref0 (pix);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 5906 "Photo.c"
+#line 5915 "Photo.c"
 			}
-			goto __finally264;
-			__catch264_g_error:
+			goto __finally265;
+			__catch265_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp31_ = NULL;
@@ -5922,16 +5931,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 5926 "Photo.c"
+#line 5935 "Photo.c"
 			}
-			__finally264:
+			__finally265:
 			{
 				gboolean _tmp33_ = FALSE;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp33_) {
-#line 5935 "Photo.c"
+#line 5944 "Photo.c"
 					{
 						RawDeveloper _tmp34_ = 0;
 						BackingPhotoRow* _tmp35_ = NULL;
@@ -5943,15 +5952,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5947 "Photo.c"
-							goto __catch267_g_error;
+#line 5956 "Photo.c"
+							goto __catch268_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5952 "Photo.c"
+#line 5961 "Photo.c"
 					}
-					goto __finally267;
-					__catch267_g_error:
+					goto __finally268;
+					__catch268_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp36_ = NULL;
@@ -5968,9 +5977,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 5972 "Photo.c"
+#line 5981 "Photo.c"
 					}
-					__finally267:
+					__finally268:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5981,7 +5990,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 5985 "Photo.c"
+#line 5994 "Photo.c"
 					}
 				}
 			}
@@ -5995,23 +6004,23 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 5999 "Photo.c"
+#line 6008 "Photo.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6003 "Photo.c"
+#line 6012 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6007 "Photo.c"
+#line 6016 "Photo.c"
 		{
 #line 731 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6011 "Photo.c"
+#line 6020 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6015 "Photo.c"
+#line 6024 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -6054,8 +6063,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				meta = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6058 "Photo.c"
-					goto __catch268_g_error;
+#line 6067 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = meta;
@@ -6069,14 +6078,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				if (_tmp41_ <= ((guint) 0)) {
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6073 "Photo.c"
+#line 6082 "Photo.c"
 					{
 						gboolean _tmp42_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp42_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp42_) {
-#line 6080 "Photo.c"
+#line 6089 "Photo.c"
 							{
 								RawDeveloper _tmp43_ = 0;
 								BackingPhotoRow* _tmp44_ = NULL;
@@ -6088,15 +6097,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6092 "Photo.c"
-									goto __catch269_g_error;
+#line 6101 "Photo.c"
+									goto __catch270_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6097 "Photo.c"
+#line 6106 "Photo.c"
 							}
-							goto __finally269;
-							__catch269_g_error:
+							goto __finally270;
+							__catch270_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp45_ = NULL;
@@ -6113,13 +6122,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6117 "Photo.c"
+#line 6126 "Photo.c"
 							}
-							__finally269:
+							__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6122 "Photo.c"
-								goto __catch268_g_error;
+#line 6131 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6127,7 +6136,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6131 "Photo.c"
+#line 6140 "Photo.c"
 				}
 #line 740 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = meta;
@@ -6147,14 +6156,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6151 "Photo.c"
+#line 6160 "Photo.c"
 					{
 						gboolean _tmp51_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp51_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp51_) {
-#line 6158 "Photo.c"
+#line 6167 "Photo.c"
 							{
 								RawDeveloper _tmp52_ = 0;
 								BackingPhotoRow* _tmp53_ = NULL;
@@ -6166,15 +6175,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6170 "Photo.c"
-									goto __catch270_g_error;
+#line 6179 "Photo.c"
+									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6175 "Photo.c"
+#line 6184 "Photo.c"
 							}
-							goto __finally270;
-							__catch270_g_error:
+							goto __finally271;
+							__catch271_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp54_ = NULL;
@@ -6191,13 +6200,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6195 "Photo.c"
+#line 6204 "Photo.c"
 							}
-							__finally270:
+							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6200 "Photo.c"
-								goto __catch268_g_error;
+#line 6209 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6205,7 +6214,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6209 "Photo.c"
+#line 6218 "Photo.c"
 				}
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = prev;
@@ -6219,8 +6228,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6223 "Photo.c"
-					goto __catch268_g_error;
+#line 6232 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = pix;
@@ -6234,14 +6243,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6238 "Photo.c"
+#line 6247 "Photo.c"
 					{
 						gboolean _tmp59_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp59_) {
-#line 6245 "Photo.c"
+#line 6254 "Photo.c"
 							{
 								RawDeveloper _tmp60_ = 0;
 								BackingPhotoRow* _tmp61_ = NULL;
@@ -6253,15 +6262,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6257 "Photo.c"
-									goto __catch271_g_error;
+#line 6266 "Photo.c"
+									goto __catch272_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6262 "Photo.c"
+#line 6271 "Photo.c"
 							}
-							goto __finally271;
-							__catch271_g_error:
+							goto __finally272;
+							__catch272_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp62_ = NULL;
@@ -6278,13 +6287,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6282 "Photo.c"
+#line 6291 "Photo.c"
 							}
-							__finally271:
+							__finally272:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6287 "Photo.c"
-								goto __catch268_g_error;
+#line 6296 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6292,7 +6301,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6296 "Photo.c"
+#line 6305 "Photo.c"
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = d;
@@ -6314,8 +6323,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6318 "Photo.c"
-					goto __catch268_g_error;
+#line 6327 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = _tmp64_;
@@ -6343,8 +6352,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 754 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6347 "Photo.c"
-					goto __catch268_g_error;
+#line 6356 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = writer;
@@ -6364,8 +6373,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6368 "Photo.c"
-					goto __catch268_g_error;
+#line 6377 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -6389,8 +6398,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 762 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6393 "Photo.c"
-					goto __catch268_g_error;
+#line 6402 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = mwriter;
@@ -6412,8 +6421,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6416 "Photo.c"
-					goto __catch268_g_error;
+#line 6425 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -6427,10 +6436,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_photo_preview_unref0 (prev);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (meta);
-#line 6431 "Photo.c"
+#line 6440 "Photo.c"
 			}
-			goto __finally268;
-			__catch268_g_error:
+			goto __finally269;
+			__catch269_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp81_ = NULL;
@@ -6447,14 +6456,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6451 "Photo.c"
+#line 6460 "Photo.c"
 				{
 					gboolean _tmp83_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp83_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp83_) {
-#line 6458 "Photo.c"
+#line 6467 "Photo.c"
 						{
 							RawDeveloper _tmp84_ = 0;
 							BackingPhotoRow* _tmp85_ = NULL;
@@ -6466,15 +6475,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6470 "Photo.c"
-								goto __catch272_g_error;
+#line 6479 "Photo.c"
+								goto __catch273_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6475 "Photo.c"
+#line 6484 "Photo.c"
 						}
-						goto __finally272;
-						__catch272_g_error:
+						goto __finally273;
+						__catch273_g_error:
 						{
 							GError* e = NULL;
 							GError* _tmp86_ = NULL;
@@ -6491,14 +6500,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_error_free0 (e);
-#line 6495 "Photo.c"
+#line 6504 "Photo.c"
 						}
-						__finally272:
+						__finally273:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (bps);
-#line 6502 "Photo.c"
+#line 6511 "Photo.c"
 						}
 					}
 				}
@@ -6506,16 +6515,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_backing_photo_row_unref0 (bps);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6510 "Photo.c"
+#line 6519 "Photo.c"
 			}
-			__finally268:
+			__finally269:
 			{
 				gboolean _tmp88_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp88_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp88_) {
-#line 6519 "Photo.c"
+#line 6528 "Photo.c"
 					{
 						RawDeveloper _tmp89_ = 0;
 						BackingPhotoRow* _tmp90_ = NULL;
@@ -6527,15 +6536,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6531 "Photo.c"
-							goto __catch273_g_error;
+#line 6540 "Photo.c"
+							goto __catch274_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6536 "Photo.c"
+#line 6545 "Photo.c"
 					}
-					goto __finally273;
-					__catch273_g_error:
+					goto __finally274;
+					__catch274_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp91_ = NULL;
@@ -6552,9 +6561,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 6556 "Photo.c"
+#line 6565 "Photo.c"
 					}
-					__finally273:
+					__finally274:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6565,7 +6574,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6569 "Photo.c"
+#line 6578 "Photo.c"
 					}
 				}
 			}
@@ -6579,22 +6588,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6583 "Photo.c"
+#line 6592 "Photo.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6587 "Photo.c"
+#line 6596 "Photo.c"
 		}
 		default:
 		{
 #line 783 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6593 "Photo.c"
+#line 6602 "Photo.c"
 		}
 	}
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6598 "Photo.c"
+#line 6607 "Photo.c"
 }
 
 
@@ -6602,14 +6611,14 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 6606 "Photo.c"
+#line 6615 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 6613 "Photo.c"
+#line 6622 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -6619,16 +6628,16 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp2_ = d;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_->developer = _tmp2_;
-#line 6623 "Photo.c"
+#line 6632 "Photo.c"
 		}
-		__finally274:
+		__finally275:
 		{
 			PhotoRow* _tmp3_ = NULL;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6632 "Photo.c"
+#line 6641 "Photo.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6638,7 +6647,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6642 "Photo.c"
+#line 6651 "Photo.c"
 		}
 	}
 }
@@ -6660,29 +6669,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
 #line 797 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 6664 "Photo.c"
+#line 6673 "Photo.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA);
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 6670 "Photo.c"
+#line 6679 "Photo.c"
 		RawDeveloper _tmp3_ = 0;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = d;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 6676 "Photo.c"
+#line 6685 "Photo.c"
 	} else {
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6680 "Photo.c"
+#line 6689 "Photo.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 803 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_CAMERA;
-#line 6686 "Photo.c"
+#line 6695 "Photo.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6690,7 +6699,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (!_tmp4_) {
 #line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_SHOTWELL;
-#line 6694 "Photo.c"
+#line 6703 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp5_ = NULL;
@@ -6698,27 +6707,27 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 		_tmp5_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6702 "Photo.c"
+#line 6711 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
 			PhotoRow* _tmp6_ = NULL;
 			RawDeveloper _tmp7_ = 0;
 			RawDeveloper _tmp8_ = 0;
 			gboolean _tmp9_ = FALSE;
-			GeeHashMap* _tmp15_ = NULL;
+			GeeHashMap* _tmp11_ = NULL;
+			RawDeveloper _tmp12_ = 0;
+			gboolean _tmp13_ = FALSE;
+			PhotoRow* _tmp15_ = NULL;
 			RawDeveloper _tmp16_ = 0;
-			gboolean _tmp17_ = FALSE;
-			PhotoRow* _tmp19_ = NULL;
-			RawDeveloper _tmp20_ = 0;
-			GeeHashMap* _tmp21_ = NULL;
-			RawDeveloper _tmp22_ = 0;
-			gpointer _tmp23_ = NULL;
-			PhotoBackingReaders* _tmp24_ = NULL;
-			BackingPhotoRow* _tmp25_ = NULL;
-			PhotoFileFormat _tmp26_ = 0;
-			BackingPhotoRow* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			PhotoFileReader* _tmp29_ = NULL;
+			GeeHashMap* _tmp17_ = NULL;
+			RawDeveloper _tmp18_ = 0;
+			gpointer _tmp19_ = NULL;
+			PhotoBackingReaders* _tmp20_ = NULL;
+			BackingPhotoRow* _tmp21_ = NULL;
+			PhotoFileFormat _tmp22_ = 0;
+			BackingPhotoRow* _tmp23_ = NULL;
+			const gchar* _tmp24_ = NULL;
+			PhotoFileReader* _tmp25_ = NULL;
 			BackingPhotoRow* _tmp30_ = NULL;
 			Orientation _tmp31_ = 0;
 			gboolean _tmp41_ = FALSE;
@@ -6735,134 +6744,135 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
 #line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 6739 "Photo.c"
+#line 6748 "Photo.c"
 				RawDeveloper _tmp10_ = 0;
 #line 815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = d;
 #line 815 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_develop_photo (self, _tmp10_);
-#line 6745 "Photo.c"
-				{
-					GdkPixbuf* _tmp11_ = NULL;
-					GdkPixbuf* _tmp12_ = NULL;
+#line 6754 "Photo.c"
+			}
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp11_ = photo_get_prefetched_copy (self, &_inner_error_);
+			_tmp11_ = self->priv->developments;
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp12_ = _tmp11_;
+			_tmp12_ = d;
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (_tmp12_);
+			_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_));
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6757 "Photo.c"
-						goto __catch276_g_error;
-					}
-				}
-				goto __finally276;
-				__catch276_g_error:
+			if (!_tmp13_) {
+#line 6764 "Photo.c"
 				{
-					GError* e = NULL;
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					e = _inner_error_;
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					_inner_error_ = NULL;
-#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_error_free0 (e);
-#line 6771 "Photo.c"
-					{
-						GeeHashMap* _tmp13_ = NULL;
+					GeeHashMap* _tmp14_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp13_ = self->priv->developments;
+					_tmp14_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6778 "Photo.c"
-					}
-#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
-					return;
-#line 6782 "Photo.c"
+					g_rec_mutex_unlock (&self->priv->__lock_developments);
+#line 6771 "Photo.c"
 				}
-				__finally276:
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 818 "/home/jens/Source/shotwell/src/Photo.vala"
+				return;
+#line 6775 "Photo.c"
+			}
+#line 821 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_revert_to_master (self, FALSE);
+#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp15_ = self->row;
+#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp16_ = d;
+#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp15_->developer = _tmp16_;
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp17_ = self->priv->developments;
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp18_ = d;
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp18_));
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+			_backing_photo_row_unref0 (self->backing_photo_row);
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+			self->backing_photo_row = (BackingPhotoRow*) _tmp19_;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp20_ = self->priv->readers;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp21_ = self->backing_photo_row;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp22_ = _tmp21_->file_format;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp23_ = self->backing_photo_row;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp24_ = _tmp23_->filepath;
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp25_ = photo_file_format_create_reader (_tmp22_, _tmp24_);
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_photo_file_adapter_unref0 (_tmp20_->developer);
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp20_->developer = _tmp25_;
+#line 6811 "Photo.c"
+			{
+				GdkPixbuf* _tmp26_ = NULL;
+				GdkPixbuf* _tmp27_ = NULL;
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp26_ = photo_get_prefetched_copy (self, &_inner_error_);
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp27_ = _tmp26_;
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+				_g_object_unref0 (_tmp27_);
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6787 "Photo.c"
-					{
-						GeeHashMap* _tmp14_ = NULL;
+#line 6823 "Photo.c"
+					goto __catch277_g_error;
+				}
+			}
+			goto __finally277;
+			__catch277_g_error:
+			{
+				GError* e = NULL;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				e = _inner_error_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				_inner_error_ = NULL;
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+				_g_error_free0 (e);
+#line 6837 "Photo.c"
+				{
+					GeeHashMap* _tmp28_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp14_ = self->priv->developments;
+					_tmp28_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6794 "Photo.c"
-					}
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_clear_error (&_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					return;
-#line 6802 "Photo.c"
+					g_rec_mutex_unlock (&self->priv->__lock_developments);
+#line 6844 "Photo.c"
 				}
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+				return;
+#line 6848 "Photo.c"
 			}
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_ = self->priv->developments;
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp16_ = d;
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp17_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp16_));
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp17_) {
-#line 6813 "Photo.c"
+			__finally277:
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6853 "Photo.c"
 				{
-					GeeHashMap* _tmp18_ = NULL;
+					GeeHashMap* _tmp29_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp18_ = self->priv->developments;
+					_tmp29_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6820 "Photo.c"
+#line 6860 "Photo.c"
 				}
-#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_clear_error (&_inner_error_);
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6824 "Photo.c"
+#line 6868 "Photo.c"
 			}
-#line 827 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_revert_to_master (self, FALSE);
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_ = self->row;
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp20_ = d;
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_->developer = _tmp20_;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp21_ = self->priv->developments;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp22_ = d;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp22_));
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_backing_photo_row_unref0 (self->backing_photo_row);
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			self->backing_photo_row = (BackingPhotoRow*) _tmp23_;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_ = self->priv->readers;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp25_ = self->backing_photo_row;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp26_ = _tmp25_->file_format;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp27_ = self->backing_photo_row;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp28_ = _tmp27_->filepath;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp29_ = photo_file_format_create_reader (_tmp26_, _tmp28_);
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_photo_file_adapter_unref0 (_tmp24_->developer);
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_->developer = _tmp29_;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = self->backing_photo_row;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = _tmp30_->original_orientation;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp31_);
-#line 6866 "Photo.c"
+#line 6876 "Photo.c"
 			{
 				PhotoTable* _tmp32_ = NULL;
 				PhotoTable* _tmp33_ = NULL;
@@ -6870,109 +6880,109 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				RawDeveloper _tmp35_ = 0;
 				BackingPhotoRow* _tmp36_ = NULL;
 				BackingPhotoID _tmp37_ = {0};
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = photo_table_get_instance ();
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = self->row;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = d;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = self->backing_photo_row;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_->id;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_update_raw_development (_tmp33_, _tmp34_, _tmp35_, &_tmp37_, &_inner_error_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp33_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6892 "Photo.c"
-					goto __catch277_g_error;
+#line 6902 "Photo.c"
+					goto __catch278_g_error;
 				}
 			}
-			goto __finally277;
-			__catch277_g_error:
+			goto __finally278;
+			__catch278_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp38_ = NULL;
 				const gchar* _tmp39_ = NULL;
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = e;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tmp38_->message;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:839: Error updating database: %s", _tmp39_);
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_);
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6914 "Photo.c"
+#line 6924 "Photo.c"
 			}
-			__finally277:
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally278:
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6919 "Photo.c"
+#line 6929 "Photo.c"
 				{
 					GeeHashMap* _tmp40_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6926 "Photo.c"
+#line 6936 "Photo.c"
 				}
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6934 "Photo.c"
+#line 6944 "Photo.c"
 			}
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = stale_raw_developer;
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6940 "Photo.c"
+#line 6950 "Photo.c"
 				RawDeveloper _tmp43_ = 0;
 				PhotoRow* _tmp44_ = NULL;
 				RawDeveloper _tmp45_ = 0;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = stale_raw_developer;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = self->row;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_->developer;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = _tmp43_ != _tmp45_;
-#line 6952 "Photo.c"
+#line 6962 "Photo.c"
 			} else {
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = FALSE;
-#line 6956 "Photo.c"
+#line 6966 "Photo.c"
 			}
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp41_) {
-#line 6960 "Photo.c"
+#line 6970 "Photo.c"
 				RawDeveloper _tmp46_ = 0;
-#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = stale_raw_developer;
-#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_delete_raw_development (self, _tmp46_);
-#line 6966 "Photo.c"
+#line 6976 "Photo.c"
 			}
 		}
-		__finally275:
+		__finally276:
 		{
 			GeeHashMap* _tmp47_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp47_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6976 "Photo.c"
+#line 6986 "Photo.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6982,20 +6992,20 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6986 "Photo.c"
+#line 6996 "Photo.c"
 		}
 	}
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = alteration_new ("image", "developer");
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_;
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_);
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp49_);
 #line 858 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp49_);
+#line 859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 6999 "Photo.c"
+#line 7009 "Photo.c"
 }
 
 
@@ -7003,17 +7013,17 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	RawDeveloper result = 0;
 	PhotoRow* _tmp0_ = NULL;
 	RawDeveloper _tmp1_ = 0;
-#line 861 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), 0);
 #line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), 0);
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->developer;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7017 "Photo.c"
+#line 7027 "Photo.c"
 }
 
 
@@ -7021,18 +7031,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GError * _inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 868 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), FALSE);
+#line 869 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = FALSE;
-#line 7029 "Photo.c"
+#line 7039 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7036 "Photo.c"
+#line 7046 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -7051,160 +7061,160 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			GeeHashMap* _tmp37_ = NULL;
 			RawDeveloper _tmp38_ = 0;
 			gboolean _tmp39_ = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp3_) {
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (!_tmp3_) {
+#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 7065 "Photo.c"
+#line 7075 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7072 "Photo.c"
+#line 7082 "Photo.c"
 				}
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7076 "Photo.c"
+#line 7086 "Photo.c"
 			}
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = d;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = raw_developer_to_string (_tmp7_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_debug ("Photo.vala:876: Delete raw development: %s %s", _tmp6_, _tmp9_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_debug ("Photo.vala:877: Delete raw development: %s %s", _tmp6_, _tmp9_);
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp9_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp6_);
 #line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_free0 (_tmp6_);
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->priv->developments;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = d;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp11_));
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
-			bpr = (BackingPhotoRow*) _tmp12_;
 #line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+			bpr = (BackingPhotoRow*) _tmp12_;
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = bpr;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->filepath;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp14_ != NULL) {
-#line 7108 "Photo.c"
+#line 7118 "Photo.c"
 				GFile* f = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				GFile* _tmp17_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = bpr;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->filepath;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_file_new_for_path (_tmp16_);
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = _tmp17_;
-#line 7121 "Photo.c"
+#line 7131 "Photo.c"
 				{
 					RawDeveloper _tmp18_ = 0;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = d;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7128 "Photo.c"
+#line 7138 "Photo.c"
 						GFile* _tmp19_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7136 "Photo.c"
-							goto __catch279_g_error;
+#line 7146 "Photo.c"
+							goto __catch280_g_error;
 						}
 					} else {
 						GFile* _tmp20_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = f;
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7147 "Photo.c"
-							goto __catch279_g_error;
+#line 7157 "Photo.c"
+							goto __catch280_g_error;
 						}
 					}
 				}
-				goto __finally279;
-				__catch279_g_error:
+				goto __finally280;
+				__catch280_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					GError* _tmp23_ = NULL;
 					const gchar* _tmp24_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					e = _inner_error_;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_inner_error_ = NULL;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = bpr;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->filepath;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = e;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_->message;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_warning ("Photo.vala:886: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (e);
-#line 7176 "Photo.c"
+#line 7186 "Photo.c"
 				}
-				__finally279:
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+				__finally280:
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 7189 "Photo.c"
+#line 7199 "Photo.c"
 					{
 						GeeHashMap* _tmp25_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7196 "Photo.c"
+#line 7206 "Photo.c"
 					}
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					return FALSE;
-#line 7204 "Photo.c"
+#line 7214 "Photo.c"
 				}
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7208 "Photo.c"
+#line 7218 "Photo.c"
 			}
 			{
 				PhotoTable* _tmp26_ = NULL;
@@ -7215,238 +7225,238 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				BackingPhotoTable* _tmp31_ = NULL;
 				BackingPhotoRow* _tmp32_ = NULL;
 				BackingPhotoID _tmp33_ = {0};
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = photo_table_get_instance ();
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = self->row;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = d;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_remove_development (_tmp27_, _tmp28_, _tmp29_, &_inner_error_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp27_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7233 "Photo.c"
-					goto __catch280_g_error;
+#line 7243 "Photo.c"
+					goto __catch281_g_error;
 				}
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = backing_photo_table_get_instance ();
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = _tmp30_;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = bpr;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_->id;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp31_, &_tmp33_, &_inner_error_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp31_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7250 "Photo.c"
-					goto __catch280_g_error;
+#line 7260 "Photo.c"
+					goto __catch281_g_error;
 				}
 			}
-			goto __finally280;
-			__catch280_g_error:
+			goto __finally281;
+			__catch281_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = e;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_->message;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:895: Database error while deleting RAW development: %s", _tmp35_);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp35_);
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 7272 "Photo.c"
+#line 7282 "Photo.c"
 			}
-			__finally280:
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally281:
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 7281 "Photo.c"
+#line 7291 "Photo.c"
 				{
 					GeeHashMap* _tmp36_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp36_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7288 "Photo.c"
+#line 7298 "Photo.c"
 				}
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 7296 "Photo.c"
+#line 7306 "Photo.c"
 			}
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = self->priv->developments;
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = d;
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp38_), NULL);
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp39_;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7308 "Photo.c"
+#line 7318 "Photo.c"
 		}
-		__finally278:
+		__finally279:
 		{
 			GeeHashMap* _tmp40_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7317 "Photo.c"
+#line 7327 "Photo.c"
 		}
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 7327 "Photo.c"
+#line 7337 "Photo.c"
 		}
 	}
-#line 901 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_raw_development_modified (self);
 #line 902 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_raw_development_modified (self);
+#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = ret;
-#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7336 "Photo.c"
+#line 7346 "Photo.c"
 }
 
 
 void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 7344 "Photo.c"
+#line 7354 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7351 "Photo.c"
+#line 7361 "Photo.c"
 		{
 			RawDeveloper _tmp1_ = 0;
 			RawDeveloper dev = 0;
 			RawDeveloper _tmp2_ = 0;
 			RawDeveloper _tmp3_ = 0;
 			RawDeveloper _tmp4_ = 0;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = d;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_delete_raw_development (self, _tmp1_);
 #line 909 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_delete_raw_development (self, _tmp1_);
+#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
-			dev = _tmp2_;
 #line 910 "/home/jens/Source/shotwell/src/Photo.vala"
+			dev = _tmp2_;
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dev;
-#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
 #line 911 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev = RAW_DEVELOPER_EMBEDDED;
-#line 7372 "Photo.c"
+#line 7382 "Photo.c"
 			}
-#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = dev;
-#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_raw_developer (self, _tmp4_);
-#line 7378 "Photo.c"
+#line 7388 "Photo.c"
 		}
-		__finally281:
+		__finally282:
 		{
 			GeeHashMap* _tmp5_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7387 "Photo.c"
+#line 7397 "Photo.c"
 		}
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7397 "Photo.c"
+#line 7407 "Photo.c"
 		}
 	}
 }
 
 
 static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7410 "Photo.c"
+#line 7420 "Photo.c"
 	}
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7416 "Photo.c"
+#line 7426 "Photo.c"
 }
 
 
 static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7427 "Photo.c"
+#line 7437 "Photo.c"
 	}
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7433 "Photo.c"
+#line 7443 "Photo.c"
 }
 
 
 static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7444 "Photo.c"
+#line 7454 "Photo.c"
 	}
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7450 "Photo.c"
+#line 7460 "Photo.c"
 }
 
 
@@ -7460,24 +7470,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp27_ = NULL;
 	gint _tmp27__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 0 + 1);
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_length1 = 0;
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_size_ = backing_length1;
-#line 7474 "Photo.c"
+#line 7484 "Photo.c"
 	{
 		PhotoRow* _tmp1_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->row;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7481 "Photo.c"
+#line 7491 "Photo.c"
 		{
 			BackingFileState** _tmp2_ = NULL;
 			gint _tmp2__length1 = 0;
@@ -7488,73 +7498,73 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			BackingFileState* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp12_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2__length1 = backing_length1;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->master;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->md5;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_);
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_);
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_);
+#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_has_editable (self);
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 7512 "Photo.c"
+#line 7522 "Photo.c"
 				BackingFileState** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
 				BackingPhotoRow* _tmp10_ = NULL;
 				BackingFileState* _tmp11_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = backing;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9__length1 = backing_length1;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->priv->editable;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7527 "Photo.c"
+#line 7537 "Photo.c"
 			}
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_is_developed (self);
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_) {
-#line 7533 "Photo.c"
+#line 7543 "Photo.c"
 				GeeCollection* dev_rows = NULL;
 				GeeCollection* _tmp13_ = NULL;
 				GeeCollection* _tmp14_ = NULL;
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_get_raw_development_photo_rows (self);
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
-				dev_rows = _tmp13_;
 #line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+				dev_rows = _tmp13_;
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev_rows;
-#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_ != NULL) {
-#line 7545 "Photo.c"
+#line 7555 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
 						GeeCollection* _tmp15_ = NULL;
 						GeeIterator* _tmp16_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = dev_rows;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_r_it = _tmp16_;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 7558 "Photo.c"
+#line 7568 "Photo.c"
 							GeeIterator* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							BackingPhotoRow* r = NULL;
@@ -7566,246 +7576,246 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							gint _tmp23__length1 = 0;
 							BackingPhotoRow* _tmp24_ = NULL;
 							BackingFileState* _tmp25_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _r_it;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = gee_iterator_next (_tmp17_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp18_) {
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7578 "Photo.c"
+#line 7588 "Photo.c"
 							}
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = gee_iterator_get (_tmp19_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
-							r = (BackingPhotoRow*) _tmp20_;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+							r = (BackingPhotoRow*) _tmp20_;
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = r;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->filepath;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
-							g_debug ("Photo.vala:928: adding: %s", _tmp22_);
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+							g_debug ("Photo.vala:929: adding: %s", _tmp22_);
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = backing;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23__length1 = backing_length1;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = r;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL);
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
-#line 7604 "Photo.c"
+#line 7614 "Photo.c"
 						}
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7608 "Photo.c"
+#line 7618 "Photo.c"
 					}
 				}
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7613 "Photo.c"
+#line 7623 "Photo.c"
 			}
 		}
-		__finally282:
+		__finally283:
 		{
 			PhotoRow* _tmp26_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7623 "Photo.c"
+#line 7633 "Photo.c"
 		}
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 7635 "Photo.c"
+#line 7645 "Photo.c"
 		}
 	}
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27__length1 = backing_length1;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp27__length1;
-#line 7646 "Photo.c"
+#line 7656 "Photo.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp27_;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7652 "Photo.c"
+#line 7662 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) {
 	PhotoFileReader* result = NULL;
 	BackingFetchMode _tmp0_ = 0;
-#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), NULL);
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = mode;
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp0_) {
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_MASTER:
-#line 7667 "Photo.c"
+#line 7677 "Photo.c"
 		{
 			PhotoFileReader* _tmp1_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_master_reader (self);
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7676 "Photo.c"
+#line 7686 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7680 "Photo.c"
+#line 7690 "Photo.c"
 		{
 			PhotoFileReader* _tmp2_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = photo_get_baseline_reader (self);
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7689 "Photo.c"
+#line 7699 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7693 "Photo.c"
+#line 7703 "Photo.c"
 		{
 			PhotoFileReader* _tmp3_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_source_reader (self);
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7702 "Photo.c"
+#line 7712 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7706 "Photo.c"
+#line 7716 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
-#line 950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_master_file_format (self);
-#line 950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7713 "Photo.c"
+#line 7723 "Photo.c"
 				PhotoFileReader* _tmp5_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7721 "Photo.c"
+#line 7731 "Photo.c"
 			} else {
 				PhotoFileReader* _tmp6_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_get_master_reader (self);
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp6_;
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7730 "Photo.c"
+#line 7740 "Photo.c"
 			}
 		}
 		default:
 		{
 			BackingFetchMode _tmp7_ = 0;
 			GEnumValue* _tmp8_;
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = mode;
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:956: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
-#line 7743 "Photo.c"
+#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
+#line 7753 "Photo.c"
 		}
 	}
 }
 
 
 static gpointer _photo_file_adapter_ref0 (gpointer self) {
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_file_adapter_ref (self) : NULL;
-#line 7752 "Photo.c"
+#line 7762 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_master_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7761 "Photo.c"
+#line 7771 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7768 "Photo.c"
+#line 7778 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7781 "Photo.c"
+#line 7791 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7788 "Photo.c"
+#line 7798 "Photo.c"
 			}
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7792 "Photo.c"
+#line 7802 "Photo.c"
 		}
-		__finally283:
+		__finally284:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7801 "Photo.c"
+#line 7811 "Photo.c"
 		}
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7809 "Photo.c"
+#line 7819 "Photo.c"
 	}
 }
 
@@ -7813,57 +7823,57 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 PhotoFileReader* photo_get_editable_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7819 "Photo.c"
+#line 7829 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7826 "Photo.c"
+#line 7836 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7839 "Photo.c"
+#line 7849 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7846 "Photo.c"
+#line 7856 "Photo.c"
 			}
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7850 "Photo.c"
+#line 7860 "Photo.c"
 		}
-		__finally284:
+		__finally285:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7859 "Photo.c"
+#line 7869 "Photo.c"
 		}
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7867 "Photo.c"
+#line 7877 "Photo.c"
 	}
 }
 
@@ -7871,16 +7881,16 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7877 "Photo.c"
+#line 7887 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7884 "Photo.c"
+#line 7894 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7889,105 +7899,105 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_ = NULL;
 			PhotoFileReader* _tmp14_ = NULL;
 			PhotoFileReader* _tmp15_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7899 "Photo.c"
+#line 7909 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 7911 "Photo.c"
+#line 7921 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7918 "Photo.c"
+#line 7928 "Photo.c"
 				}
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7922 "Photo.c"
+#line 7932 "Photo.c"
 			}
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7930 "Photo.c"
+#line 7940 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 7942 "Photo.c"
+#line 7952 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7949 "Photo.c"
+#line 7959 "Photo.c"
 				}
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7953 "Photo.c"
+#line 7963 "Photo.c"
 			}
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 7963 "Photo.c"
+#line 7973 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7970 "Photo.c"
+#line 7980 "Photo.c"
 			}
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7974 "Photo.c"
+#line 7984 "Photo.c"
 		}
-		__finally285:
+		__finally286:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7983 "Photo.c"
+#line 7993 "Photo.c"
 		}
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7991 "Photo.c"
+#line 8001 "Photo.c"
 	}
 }
 
@@ -7995,16 +8005,16 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 static PhotoFileReader* photo_get_source_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8001 "Photo.c"
+#line 8011 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8008 "Photo.c"
+#line 8018 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8013,105 +8023,105 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_ = NULL;
 			PhotoFileReader* _tmp14_ = NULL;
 			PhotoFileReader* _tmp15_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8023 "Photo.c"
+#line 8033 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 8035 "Photo.c"
+#line 8045 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8042 "Photo.c"
+#line 8052 "Photo.c"
 				}
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8046 "Photo.c"
+#line 8056 "Photo.c"
 			}
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8054 "Photo.c"
+#line 8064 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 8066 "Photo.c"
+#line 8076 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8073 "Photo.c"
+#line 8083 "Photo.c"
 				}
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8077 "Photo.c"
+#line 8087 "Photo.c"
 			}
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8087 "Photo.c"
+#line 8097 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8094 "Photo.c"
+#line 8104 "Photo.c"
 			}
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8098 "Photo.c"
+#line 8108 "Photo.c"
 		}
-		__finally286:
+		__finally287:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8107 "Photo.c"
+#line 8117 "Photo.c"
 		}
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8115 "Photo.c"
+#line 8125 "Photo.c"
 	}
 }
 
@@ -8119,57 +8129,57 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8125 "Photo.c"
+#line 8135 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8132 "Photo.c"
+#line 8142 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8145 "Photo.c"
+#line 8155 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8152 "Photo.c"
+#line 8162 "Photo.c"
 			}
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8156 "Photo.c"
+#line 8166 "Photo.c"
 		}
-		__finally287:
+		__finally288:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8165 "Photo.c"
+#line 8175 "Photo.c"
 		}
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8173 "Photo.c"
+#line 8183 "Photo.c"
 	}
 }
 
@@ -8177,54 +8187,54 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 gboolean photo_is_developed (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8183 "Photo.c"
+#line 8193 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8190 "Photo.c"
+#line 8200 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8200 "Photo.c"
+#line 8210 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8207 "Photo.c"
+#line 8217 "Photo.c"
 			}
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8211 "Photo.c"
+#line 8221 "Photo.c"
 		}
-		__finally288:
+		__finally289:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8220 "Photo.c"
+#line 8230 "Photo.c"
 		}
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8228 "Photo.c"
+#line 8238 "Photo.c"
 	}
 }
 
@@ -8232,54 +8242,54 @@ gboolean photo_is_developed (Photo* self) {
 gboolean photo_has_editable (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8238 "Photo.c"
+#line 8248 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8245 "Photo.c"
+#line 8255 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8255 "Photo.c"
+#line 8265 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8262 "Photo.c"
+#line 8272 "Photo.c"
 			}
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8266 "Photo.c"
+#line 8276 "Photo.c"
 		}
-		__finally289:
+		__finally290:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8275 "Photo.c"
+#line 8285 "Photo.c"
 		}
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8283 "Photo.c"
+#line 8293 "Photo.c"
 	}
 }
 
@@ -8287,57 +8297,57 @@ gboolean photo_has_editable (Photo* self) {
 gboolean photo_does_master_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8293 "Photo.c"
+#line 8303 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8300 "Photo.c"
+#line 8310 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8313 "Photo.c"
+#line 8323 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8320 "Photo.c"
+#line 8330 "Photo.c"
 			}
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8324 "Photo.c"
+#line 8334 "Photo.c"
 		}
-		__finally290:
+		__finally291:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8333 "Photo.c"
+#line 8343 "Photo.c"
 		}
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8341 "Photo.c"
+#line 8351 "Photo.c"
 	}
 }
 
@@ -8345,75 +8355,75 @@ gboolean photo_does_master_exist (Photo* self) {
 gboolean photo_does_editable_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8351 "Photo.c"
+#line 8361 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8358 "Photo.c"
+#line 8368 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8369 "Photo.c"
+#line 8379 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 8381 "Photo.c"
+#line 8391 "Photo.c"
 			} else {
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8385 "Photo.c"
+#line 8395 "Photo.c"
 			}
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8389 "Photo.c"
+#line 8399 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp7_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->readers;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8396 "Photo.c"
+#line 8406 "Photo.c"
 			}
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8400 "Photo.c"
+#line 8410 "Photo.c"
 		}
-		__finally291:
+		__finally292:
 		{
 			PhotoBackingReaders* _tmp8_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = self->priv->readers;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8409 "Photo.c"
+#line 8419 "Photo.c"
 		}
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8417 "Photo.c"
+#line 8427 "Photo.c"
 	}
 }
 
@@ -8421,54 +8431,54 @@ gboolean photo_does_editable_exist (Photo* self) {
 gboolean photo_is_master_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8427 "Photo.c"
+#line 8437 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8434 "Photo.c"
+#line 8444 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8444 "Photo.c"
+#line 8454 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8451 "Photo.c"
+#line 8461 "Photo.c"
 			}
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8455 "Photo.c"
+#line 8465 "Photo.c"
 		}
-		__finally292:
+		__finally293:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8464 "Photo.c"
+#line 8474 "Photo.c"
 		}
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8472 "Photo.c"
+#line 8482 "Photo.c"
 	}
 }
 
@@ -8476,69 +8486,69 @@ gboolean photo_is_master_baseline (Photo* self) {
 gboolean photo_is_master_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), FALSE);
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_editable (self);
-#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = !_tmp0_;
-#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8488 "Photo.c"
+#line 8498 "Photo.c"
 }
 
 
 gboolean photo_is_editable_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8497 "Photo.c"
+#line 8507 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8504 "Photo.c"
+#line 8514 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8514 "Photo.c"
+#line 8524 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8521 "Photo.c"
+#line 8531 "Photo.c"
 			}
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8525 "Photo.c"
+#line 8535 "Photo.c"
 		}
-		__finally293:
+		__finally294:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8534 "Photo.c"
+#line 8544 "Photo.c"
 		}
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8542 "Photo.c"
+#line 8552 "Photo.c"
 	}
 }
 
@@ -8546,72 +8556,72 @@ gboolean photo_is_editable_baseline (Photo* self) {
 gboolean photo_is_editable_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), FALSE);
+#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_editable (self);
-#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8558 "Photo.c"
+#line 8568 "Photo.c"
 }
 
 
 BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8567 "Photo.c"
+#line 8577 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8574 "Photo.c"
+#line 8584 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
 			BackingPhotoRow* _tmp3_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8587 "Photo.c"
+#line 8597 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8594 "Photo.c"
+#line 8604 "Photo.c"
 			}
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8598 "Photo.c"
+#line 8608 "Photo.c"
 		}
-		__finally294:
+		__finally295:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8607 "Photo.c"
+#line 8617 "Photo.c"
 		}
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8615 "Photo.c"
+#line 8625 "Photo.c"
 	}
 }
 
@@ -8619,79 +8629,79 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8625 "Photo.c"
+#line 8635 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8632 "Photo.c"
+#line 8642 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8642 "Photo.c"
+#line 8652 "Photo.c"
 				BackingPhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->editable;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8651 "Photo.c"
+#line 8661 "Photo.c"
 				{
 					PhotoRow* _tmp5_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp5_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8658 "Photo.c"
+#line 8668 "Photo.c"
 				}
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8662 "Photo.c"
+#line 8672 "Photo.c"
 			} else {
-#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8666 "Photo.c"
+#line 8676 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8673 "Photo.c"
+#line 8683 "Photo.c"
 				}
-#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8677 "Photo.c"
+#line 8687 "Photo.c"
 			}
 		}
-		__finally295:
+		__finally296:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8687 "Photo.c"
+#line 8697 "Photo.c"
 		}
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8695 "Photo.c"
+#line 8705 "Photo.c"
 	}
 }
 
@@ -8699,76 +8709,76 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 	GeeCollection* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8705 "Photo.c"
+#line 8715 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8712 "Photo.c"
+#line 8722 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8720 "Photo.c"
+#line 8730 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				GeeCollection* _tmp4_ = NULL;
 				GeeCollection* _tmp5_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8734 "Photo.c"
+#line 8744 "Photo.c"
 			} else {
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8740 "Photo.c"
+#line 8750 "Photo.c"
 			}
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8744 "Photo.c"
+#line 8754 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8751 "Photo.c"
+#line 8761 "Photo.c"
 			}
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8755 "Photo.c"
+#line 8765 "Photo.c"
 		}
-		__finally296:
+		__finally297:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8764 "Photo.c"
+#line 8774 "Photo.c"
 		}
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8772 "Photo.c"
+#line 8782 "Photo.c"
 	}
 }
 
@@ -8776,96 +8786,96 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8782 "Photo.c"
+#line 8792 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8789 "Photo.c"
+#line 8799 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8797 "Photo.c"
+#line 8807 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				RawDeveloper _tmp4_ = 0;
 				gpointer _tmp5_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = d;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_));
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8811 "Photo.c"
+#line 8821 "Photo.c"
 			} else {
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8817 "Photo.c"
+#line 8827 "Photo.c"
 			}
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8821 "Photo.c"
+#line 8831 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8828 "Photo.c"
+#line 8838 "Photo.c"
 			}
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8832 "Photo.c"
+#line 8842 "Photo.c"
 		}
-		__finally297:
+		__finally298:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8841 "Photo.c"
+#line 8851 "Photo.c"
 		}
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8849 "Photo.c"
+#line 8859 "Photo.c"
 	}
 }
 
 
 static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	PhotoFileFormat* dup;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (PhotoFileFormat, 1);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (PhotoFileFormat));
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 8862 "Photo.c"
+#line 8872 "Photo.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 8869 "Photo.c"
+#line 8879 "Photo.c"
 }
 
 
@@ -8877,37 +8887,37 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	PhotoFileReader* _tmp2_ = NULL;
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat* _tmp4_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), NULL);
+#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp1_ == NULL) {
 #line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp1_ == NULL) {
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 8897 "Photo.c"
+#line 8907 "Photo.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = __photo_file_format_dup0 (&_tmp3_);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8911 "Photo.c"
+#line 8921 "Photo.c"
 }
 
 
@@ -8917,75 +8927,75 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 	PhotoFileFormat _tmp0_ = 0;
 	ExportFormatParameters _tmp1_ = {0};
 	ExportFormatMode _tmp2_ = 0;
-#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (params != NULL, 0);
 #line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (params != NULL, 0);
+#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = _tmp0_;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *params;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.mode;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp2_) {
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8937 "Photo.c"
+#line 8947 "Photo.c"
 		{
 			PhotoFileFormat _tmp3_ = 0;
-#line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_master_file_format (self);
-#line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp3_;
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp3_;
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8946 "Photo.c"
+#line 8956 "Photo.c"
 		}
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 8950 "Photo.c"
+#line 8960 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
-#line 1096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_best_export_file_format (self);
-#line 1096 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp4_;
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp4_;
+#line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8959 "Photo.c"
+#line 8969 "Photo.c"
 		}
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8963 "Photo.c"
+#line 8973 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_.specified_format;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp6_;
 #line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp6_;
+#line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8975 "Photo.c"
+#line 8985 "Photo.c"
 		}
 		default:
 		{
-#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1104: get_export_format_for_parameters: unsupported export " \
+#line 1105 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \
 "format mode");
-#line 8981 "Photo.c"
+#line 8991 "Photo.c"
 		}
 	}
-#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8988 "Photo.c"
+#line 8998 "Photo.c"
 }
 
 
@@ -8995,81 +9005,81 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	ExportFormatParameters _tmp0_ = {0};
 	ExportFormatMode _tmp1_ = 0;
 	const gchar* _tmp8_ = NULL;
-#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (params != NULL, NULL);
 #line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (params != NULL, NULL);
+#line 1112 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *params;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.mode;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp1_) {
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9012 "Photo.c"
+#line 9022 "Photo.c"
 		{
 			GFile* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp4_;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_object_unref0 (_tmp3_);
 #line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_object_unref0 (_tmp3_);
+#line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9031 "Photo.c"
+#line 9041 "Photo.c"
 		}
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9037 "Photo.c"
+#line 9047 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_get_export_format_for_parameters (self, &_tmp5_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_get_export_basename (self, &_tmp6_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp7_;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 9054 "Photo.c"
+#line 9064 "Photo.c"
 		}
 		default:
 		{
-#line 1123 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1123: get_export_basename_for_parameters: unsupported expor" \
+#line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \
 "t format mode");
-#line 9060 "Photo.c"
+#line 9070 "Photo.c"
 		}
 	}
-#line 1126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _result_;
-#line 1126 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp8_ != NULL, "result != null");
 #line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp8_ != NULL, "result != null");
+#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9071 "Photo.c"
+#line 9081 "Photo.c"
 }
 
 
@@ -9198,243 +9208,243 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	PhotoImportParams* _tmp176_ = NULL;
 	Thumbnails* _tmp177_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9212 "Photo.c"
+#line 9222 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFileInfo* _tmp5_ = NULL;
 		GFileInfo* _tmp6_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = file;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9226 "Photo.c"
-			goto __catch298_g_error;
+#line 9236 "Photo.c"
+			goto __catch299_g_error;
 		}
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp6_;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9239 "Photo.c"
+#line 9249 "Photo.c"
 	}
-	goto __finally298;
-	__catch298_g_error:
+	goto __finally299;
+	__catch299_g_error:
 	{
 		GError* err = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9259 "Photo.c"
+#line 9269 "Photo.c"
 	}
-	__finally298:
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally299:
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9274 "Photo.c"
+#line 9284 "Photo.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
 #line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9290 "Photo.c"
+#line 9300 "Photo.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_is_file_image (_tmp9_);
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 9298 "Photo.c"
+#line 9308 "Photo.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = file;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1160: Not importing %s: Not an image file", _tmp13_);
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1161: Not importing %s: Not an image file", _tmp13_);
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp13_);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9320 "Photo.c"
+#line 9330 "Photo.c"
 	}
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp15_) {
-#line 9328 "Photo.c"
+#line 9338 "Photo.c"
 		GFile* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = file;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = g_file_get_path (_tmp16_);
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1166: Not importing %s: Unsupported extension", _tmp18_);
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1167: Not importing %s: Unsupported extension", _tmp18_);
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp18_);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9350 "Photo.c"
+#line 9360 "Photo.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp19_, &_tmp20_);
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp20_;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->exif_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9364 "Photo.c"
+#line 9374 "Photo.c"
 		PhotoImportParams* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_->thumbnail_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9373 "Photo.c"
+#line 9383 "Photo.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9377 "Photo.c"
+#line 9387 "Photo.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9381 "Photo.c"
+#line 9391 "Photo.c"
 		PhotoImportParams* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->full_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9390 "Photo.c"
+#line 9400 "Photo.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9394 "Photo.c"
+#line 9404 "Photo.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9398 "Photo.c"
+#line 9408 "Photo.c"
 		PhotoImportParams* _tmp29_ = NULL;
 		PhotoImportParams* _tmp30_ = NULL;
 		PhotoFileSnifferOptions _tmp31_ = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_->sniffer_options;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9410 "Photo.c"
+#line 9420 "Photo.c"
 	}
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->sniffer_options;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp35_;
-#line 9422 "Photo.c"
+#line 9432 "Photo.c"
 	{
 		PhotoFileInterrogator* _tmp36_ = NULL;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = interrogator;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9431 "Photo.c"
-			goto __catch299_g_error;
+#line 9441 "Photo.c"
+			goto __catch300_g_error;
 		}
 	}
-	goto __finally299;
-	__catch299_g_error:
+	goto __finally300;
+	__catch300_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp37_ = NULL;
@@ -9442,120 +9452,120 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		gchar* _tmp39_ = NULL;
 		GError* _tmp40_ = NULL;
 		const gchar* _tmp41_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = file;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_file_get_path (_tmp37_);
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_->message;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1182: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_);
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1183: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_);
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp39_);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DECODE_ERROR;
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9474 "Photo.c"
+#line 9484 "Photo.c"
 	}
-	__finally299:
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally300:
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9491 "Photo.c"
+#line 9501 "Photo.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_);
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp43_) {
 #line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp43_) {
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9509 "Photo.c"
+#line 9519 "Photo.c"
 	}
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_);
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
-	detected = _tmp45_;
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+	detected = _tmp45_;
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = detected;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_ == NULL) {
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9523 "Photo.c"
+#line 9533 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp48_ = NULL;
 		PhotoFileFormat _tmp49_ = 0;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = detected;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_->file_format;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9533 "Photo.c"
+#line 9543 "Photo.c"
 	}
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp46_) {
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp46_) {
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9549 "Photo.c"
+#line 9559 "Photo.c"
 	}
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->sniffer_options;
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9557 "Photo.c"
+#line 9567 "Photo.c"
 		DetectedPhotoInformation* _tmp52_ = NULL;
 		PhotoImportParams* _tmp53_ = NULL;
 		const gchar* _tmp54_ = NULL;
@@ -9568,65 +9578,65 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		PhotoImportParams* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = detected;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = params;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = _tmp53_->exif_md5;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = g_strdup (_tmp54_);
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp52_->exif_md5);
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp52_->exif_md5 = _tmp55_;
 #line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp52_->exif_md5 = _tmp55_;
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = detected;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = params;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_->thumbnail_md5;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = g_strdup (_tmp58_);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp56_->thumbnail_md5);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp56_->thumbnail_md5 = _tmp59_;
 #line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp56_->thumbnail_md5 = _tmp59_;
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = params;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = _tmp61_->full_md5;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = g_strdup (_tmp62_);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp60_->md5);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_->md5 = _tmp63_;
-#line 9606 "Photo.c"
+#line 9616 "Photo.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = ORIENTATION_TOP_LEFT;
 #line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
-	exposure_time = (time_t) 0;
+	orientation = ORIENTATION_TOP_LEFT;
 #line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
+	exposure_time = (time_t) 0;
+#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = g_strdup ("");
-#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
-	title = _tmp64_;
 #line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
+	title = _tmp64_;
+#line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = g_strdup ("");
-#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
-	comment = _tmp65_;
 #line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
+	comment = _tmp65_;
+#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
 	rating = RATING_UNRATED;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp66_ = detected;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = _tmp66_->metadata;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9628 "Photo.c"
+#line 9638 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp68_ = NULL;
 		PhotoMetadata* _tmp69_ = NULL;
@@ -9648,362 +9658,362 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		DetectedPhotoInformation* _tmp87_ = NULL;
 		PhotoMetadata* _tmp88_ = NULL;
 		Rating _tmp89_ = 0;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = detected;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = _tmp68_->metadata;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_);
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
-		date_time = _tmp70_;
 #line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+		date_time = _tmp70_;
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = date_time;
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9662 "Photo.c"
+#line 9672 "Photo.c"
 			MetadataDateTime* _tmp72_ = NULL;
 			time_t _tmp73_ = 0;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = date_time;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9671 "Photo.c"
+#line 9681 "Photo.c"
 		}
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp74_->metadata;
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = photo_metadata_get_orientation (_tmp75_);
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
-		orientation = _tmp76_;
 #line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+		orientation = _tmp76_;
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = detected;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = _tmp77_->metadata;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
-		title = _tmp79_;
 #line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+		title = _tmp79_;
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = detected;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = _tmp80_->metadata;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
-		comment = _tmp82_;
 #line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+		comment = _tmp82_;
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = params;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = detected;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_->metadata;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp83_->keywords);
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection);
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = detected;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = _tmp87_->metadata;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = photo_metadata_get_rating (_tmp88_);
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		rating = _tmp89_;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 9723 "Photo.c"
+#line 9733 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_->colorspace;
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9733 "Photo.c"
+#line 9743 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = detected;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = _tmp94_->channels;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9743 "Photo.c"
+#line 9753 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp91_) {
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = TRUE;
-#line 9749 "Photo.c"
+#line 9759 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp96_ = NULL;
 		gint _tmp97_ = 0;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = detected;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = _tmp96_->bits_per_channel;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9759 "Photo.c"
+#line 9769 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9763 "Photo.c"
+#line 9773 "Photo.c"
 		GFile* _tmp98_ = NULL;
 		gchar* _tmp99_ = NULL;
 		gchar* _tmp100_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = file;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = g_file_get_path (_tmp98_);
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp99_;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1229: Not importing %s: Unsupported color format", _tmp100_);
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1230: Not importing %s: Unsupported color format", _tmp100_);
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp100_);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9793 "Photo.c"
+#line 9803 "Photo.c"
 	}
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = _tmp101_->row;
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID);
 #line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID);
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp103_ = params;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp104_ = _tmp103_->row;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp105_ = _tmp104_->master;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp106_ = file;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp107_ = g_file_get_path (_tmp106_);
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp105_->filepath);
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp105_->filepath = _tmp107_;
 #line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp105_->filepath = _tmp107_;
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp108_ = params;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp109_ = _tmp108_->row;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp110_ = _tmp109_->master;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp111_ = detected;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = _tmp111_->image_dim;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp110_->dim = _tmp112_;
 #line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp110_->dim = _tmp112_;
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = params;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp114_ = _tmp113_->row;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp115_ = _tmp114_->master;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp116_ = info;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp117_ = g_file_info_get_size (_tmp116_);
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp115_->filesize = _tmp117_;
 #line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp115_->filesize = _tmp117_;
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp118_ = params;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp119_ = _tmp118_->row;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp120_ = _tmp119_->master;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp121_ = timestamp;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = _tmp121_.tv_sec;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp120_->timestamp = (time_t) _tmp122_;
 #line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp120_->timestamp = (time_t) _tmp122_;
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp123_ = params;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = _tmp123_->row;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = exposure_time;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp124_->exposure_time = _tmp125_;
 #line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp124_->exposure_time = _tmp125_;
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp126_ = params;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp127_ = _tmp126_->row;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp128_ = orientation;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp127_->orientation = _tmp128_;
 #line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp127_->orientation = _tmp128_;
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp129_ = params;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp130_ = _tmp129_->row;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = _tmp130_->master;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp132_ = orientation;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp131_->original_orientation = _tmp132_;
 #line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp131_->original_orientation = _tmp132_;
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = params;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _tmp133_->row;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp135_ = params;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp136_ = _tmp135_->import_id;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp134_->import_id = _tmp136_;
 #line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp134_->import_id = _tmp136_;
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp137_ = params;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp138_ = _tmp137_->row;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
-	event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID);
 #line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+	event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID);
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp139_ = params;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp140_ = _tmp139_->row;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp140_->transformations);
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp140_->transformations = NULL;
 #line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp140_->transformations = NULL;
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp141_ = params;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp142_ = _tmp141_->row;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp143_ = detected;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp144_ = _tmp143_->md5;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp145_ = g_strdup (_tmp144_);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp142_->md5);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp142_->md5 = _tmp145_;
 #line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp142_->md5 = _tmp145_;
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp146_ = params;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp147_ = _tmp146_->row;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp148_ = detected;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp149_ = _tmp148_->thumbnail_md5;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp150_ = g_strdup (_tmp149_);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp147_->thumbnail_md5);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp147_->thumbnail_md5 = _tmp150_;
 #line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp147_->thumbnail_md5 = _tmp150_;
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp151_ = params;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp152_ = _tmp151_->row;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = detected;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = _tmp153_->exif_md5;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp155_ = g_strdup (_tmp154_);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp152_->exif_md5);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp152_->exif_md5 = _tmp155_;
 #line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp152_->exif_md5 = _tmp155_;
+#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp156_ = params;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp157_ = _tmp156_->row;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp157_->time_created = (time_t) 0;
 #line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp157_->time_created = (time_t) 0;
+#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp158_ = params;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp159_ = _tmp158_->row;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp159_->flags = (guint64) 0;
 #line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp159_->flags = (guint64) 0;
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp160_ = params;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp161_ = _tmp160_->row;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp162_ = _tmp161_->master;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp163_ = detected;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp164_ = _tmp163_->file_format;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp162_->file_format = _tmp164_;
 #line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp162_->file_format = _tmp164_;
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp165_ = params;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp166_ = _tmp165_->row;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp167_ = title;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp168_ = g_strdup (_tmp167_);
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp166_->title);
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp166_->title = _tmp168_;
 #line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp166_->title = _tmp168_;
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp169_ = params;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp170_ = _tmp169_->row;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp171_ = comment;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp172_ = g_strdup (_tmp171_);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp170_->comment);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp170_->comment = _tmp172_;
 #line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp170_->comment = _tmp172_;
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp173_ = params;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_ = _tmp173_->row;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp175_ = rating;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_->rating = _tmp175_;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp176_ = params;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp177_ = _tmp176_->thumbnails;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10005 "Photo.c"
+#line 10015 "Photo.c"
 		PhotoFileReader* reader = NULL;
 		PhotoImportParams* _tmp178_ = NULL;
 		PhotoRow* _tmp179_ = NULL;
@@ -10014,148 +10024,153 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		BackingPhotoRow* _tmp184_ = NULL;
 		const gchar* _tmp185_ = NULL;
 		PhotoFileReader* _tmp186_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+		PhotoFileReader* _tmp187_ = NULL;
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp178_ = params;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp179_ = _tmp178_->row;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp180_ = _tmp179_->master;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp181_ = _tmp180_->file_format;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp182_ = params;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp183_ = _tmp182_->row;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp184_ = _tmp183_->master;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp185_ = _tmp184_->filepath;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_);
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		reader = _tmp186_;
-#line 10036 "Photo.c"
-		{
-			PhotoImportParams* _tmp187_ = NULL;
-			Thumbnails* _tmp188_ = NULL;
-			PhotoFileReader* _tmp189_ = NULL;
-			PhotoImportParams* _tmp190_ = NULL;
-			PhotoRow* _tmp191_ = NULL;
-			Orientation _tmp192_ = 0;
-			PhotoImportParams* _tmp193_ = NULL;
-			PhotoRow* _tmp194_ = NULL;
-			BackingPhotoRow* _tmp195_ = NULL;
-			Dimensions _tmp196_ = {0};
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp187_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp188_ = _tmp187_->thumbnails;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp189_ = reader;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp190_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp191_ = _tmp190_->row;
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp192_ = _tmp191_->orientation;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp193_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp194_ = _tmp193_->row;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp195_ = _tmp194_->master;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp196_ = _tmp195_->dim;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			thumbnail_cache_generate_for_photo (_tmp188_, _tmp189_, _tmp192_, &_tmp196_, &_inner_error_);
+		_tmp187_ = reader;
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL);
+#line 10051 "Photo.c"
+		{
+			PhotoImportParams* _tmp188_ = NULL;
+			Thumbnails* _tmp189_ = NULL;
+			PhotoFileReader* _tmp190_ = NULL;
+			PhotoImportParams* _tmp191_ = NULL;
+			PhotoRow* _tmp192_ = NULL;
+			Orientation _tmp193_ = 0;
+			PhotoImportParams* _tmp194_ = NULL;
+			PhotoRow* _tmp195_ = NULL;
+			BackingPhotoRow* _tmp196_ = NULL;
+			Dimensions _tmp197_ = {0};
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp188_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp189_ = _tmp188_->thumbnails;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp190_ = reader;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp191_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp192_ = _tmp191_->row;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp193_ = _tmp192_->orientation;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp194_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp195_ = _tmp194_->row;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp196_ = _tmp195_->master;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp197_ = _tmp196_->dim;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_);
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10072 "Photo.c"
-				goto __catch300_g_error;
+#line 10087 "Photo.c"
+				goto __catch301_g_error;
 			}
 		}
-		goto __finally300;
-		__catch300_g_error:
+		goto __finally301;
+		__catch301_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp197_ = NULL;
-			ImportResult _tmp198_ = 0;
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+			GError* _tmp198_ = NULL;
+			ImportResult _tmp199_ = 0;
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp197_ = err;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp198_ = import_result_convert_error (_tmp197_, IMPORT_RESULT_FILE_ERROR);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			result = _tmp198_;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp198_ = err;
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp199_ = import_result_convert_error (_tmp198_, IMPORT_RESULT_FILE_ERROR);
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+			result = _tmp199_;
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10110 "Photo.c"
+#line 10125 "Photo.c"
 		}
-		__finally300:
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally301:
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0;
-#line 10135 "Photo.c"
+#line 10150 "Photo.c"
 		}
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10139 "Photo.c"
+#line 10154 "Photo.c"
 	}
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10157 "Photo.c"
+#line 10172 "Photo.c"
 }
 
 
@@ -10220,305 +10235,305 @@ void photo_create_pre_import (PhotoImportParams* params) {
 	PhotoFileSnifferOptions _tmp55_ = 0;
 	PhotoFileInterrogator* _tmp56_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params));
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = params;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_->row;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = params;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_->row;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->master;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_get_path (file);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp7_->filepath);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_->filepath = _tmp8_;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = params;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_->row;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_->master;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_tmp11_->dim, 0, 0);
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = params;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_->row;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->master;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_->filesize = (gint64) 0;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = params;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_->row;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_->master;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_->timestamp = (time_t) 0;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = params;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_->row;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_->exposure_time = (time_t) 0;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = params;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_->row;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_->orientation = ORIENTATION_TOP_LEFT;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = params;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_->row;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->master;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->original_orientation = ORIENTATION_TOP_LEFT;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = params;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_->row;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = params;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_->import_id;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_->import_id = _tmp28_;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = params;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_->row;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID);
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = params;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_->row;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp32_->transformations);
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_->transformations = NULL;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->row;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp34_->md5);
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_->md5 = NULL;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = params;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_->row;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp36_->thumbnail_md5);
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->thumbnail_md5 = NULL;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = params;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->row;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp38_->exif_md5);
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_->exif_md5 = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = params;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_->row;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_->time_created = (time_t) 0;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = params;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_->row;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_->flags = (guint64) 0;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = params;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_->row;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->master;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = params;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_->row;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp47_->title);
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_->title = NULL;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = params;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_->row;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp49_->comment);
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_->comment = NULL;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->row;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp51_->rating = RATING_UNRATED;
 #line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp51_->rating = RATING_UNRATED;
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = params;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = _tmp52_->file;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = params;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_->sniffer_options;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp56_;
-#line 10396 "Photo.c"
+#line 10411 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
 		DetectedPhotoInformation* _tmp57_ = NULL;
 		gboolean _tmp58_ = FALSE;
 		gboolean _tmp59_ = FALSE;
 		DetectedPhotoInformation* _tmp60_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10407 "Photo.c"
-			goto __catch301_g_error;
+#line 10422 "Photo.c"
+			goto __catch302_g_error;
 		}
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp57_;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10418 "Photo.c"
+#line 10433 "Photo.c"
 			gboolean _tmp61_ = FALSE;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = !_tmp61_;
-#line 10424 "Photo.c"
+#line 10439 "Photo.c"
 		} else {
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10428 "Photo.c"
+#line 10443 "Photo.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10432 "Photo.c"
+#line 10447 "Photo.c"
 			DetectedPhotoInformation* _tmp62_ = NULL;
 			PhotoFileFormat _tmp63_ = 0;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = detected;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_->file_format;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10441 "Photo.c"
+#line 10456 "Photo.c"
 		} else {
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10445 "Photo.c"
+#line 10460 "Photo.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10449 "Photo.c"
+#line 10464 "Photo.c"
 			PhotoImportParams* _tmp64_ = NULL;
 			PhotoRow* _tmp65_ = NULL;
 			BackingPhotoRow* _tmp66_ = NULL;
 			DetectedPhotoInformation* _tmp67_ = NULL;
 			PhotoFileFormat _tmp68_ = 0;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = params;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = _tmp64_->row;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = _tmp65_->master;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = detected;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = _tmp67_->file_format;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_->file_format = _tmp68_;
-#line 10467 "Photo.c"
+#line 10482 "Photo.c"
 		}
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10471 "Photo.c"
+#line 10486 "Photo.c"
 	}
-	goto __finally301;
-	__catch301_g_error:
+	goto __finally302;
+	__catch302_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp69_ = NULL;
 		gchar* _tmp70_ = NULL;
 		GError* _tmp71_ = NULL;
 		const gchar* _tmp72_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = g_file_get_path (file);
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = err;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_->message;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:1305: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_);
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_debug ("Photo.vala:1307: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_);
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp70_);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10499 "Photo.c"
+#line 10514 "Photo.c"
 	}
-	__finally301:
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally302:
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10514 "Photo.c"
+#line 10529 "Photo.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 10520 "Photo.c"
+#line 10535 "Photo.c"
 }
 
 
@@ -10560,51 +10575,51 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	PhotoMetadata* _tmp41_ = NULL;
 	BackingPhotoRow* _tmp45_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (G_IS_FILE (file), NULL);
+#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_detected = NULL;
 #line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_detected = NULL;
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
-	backing = _tmp0_;
 #line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
+	backing = _tmp0_;
+#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 10576 "Photo.c"
+#line 10591 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
 		GFileInfo* _tmp4_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = file;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10590 "Photo.c"
-			goto __catch302_g_error;
+#line 10605 "Photo.c"
+			goto __catch303_g_error;
 		}
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp4_;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 10603 "Photo.c"
+#line 10618 "Photo.c"
 	}
-	goto __finally302;
-	__catch302_g_error:
+	goto __finally303;
+	__catch303_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -10612,350 +10627,350 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = file;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_file_get_path (_tmp5_);
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = err;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->message;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1320: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp7_);
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = NULL;
+		g_critical ("Photo.vala:1322: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp7_);
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = NULL;
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10644 "Photo.c"
+#line 10659 "Photo.c"
 		} else {
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10648 "Photo.c"
+#line 10663 "Photo.c"
 		}
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10652 "Photo.c"
+#line 10667 "Photo.c"
 	}
-	__finally302:
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally303:
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10665 "Photo.c"
+#line 10680 "Photo.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = options;
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_);
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp12_;
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = interrogator;
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_interrogator_interrogate (_tmp13_, &_inner_error_);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10691 "Photo.c"
+#line 10706 "Photo.c"
 	}
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_);
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp15_;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _vala_detected;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = TRUE;
-#line 10707 "Photo.c"
+#line 10722 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp18_ = NULL;
 		gboolean _tmp19_ = FALSE;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = interrogator;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10717 "Photo.c"
+#line 10732 "Photo.c"
 	}
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10721 "Photo.c"
+#line 10736 "Photo.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1330: Photo update: %s no longer a recognized image", _tmp21_);
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp21_);
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = NULL;
+		g_critical ("Photo.vala:1332: Photo update: %s no longer a recognized image", _tmp21_);
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp21_);
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = NULL;
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10744 "Photo.c"
+#line 10759 "Photo.c"
 		} else {
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10748 "Photo.c"
+#line 10763 "Photo.c"
 		}
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10752 "Photo.c"
+#line 10767 "Photo.c"
 	}
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp22_, &_tmp23_);
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
-	modification_time = _tmp23_;
 #line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+	modification_time = _tmp23_;
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = backing;
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = file;
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = g_file_get_path (_tmp25_);
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp24_->filepath);
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->filepath = _tmp26_;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = modification_time;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.tv_sec;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_->timestamp = (time_t) _tmp29_;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = backing;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = info;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_file_info_get_size (_tmp31_);
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_->filesize = _tmp32_;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = backing;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _vala_detected;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_->file_format;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_->file_format = _tmp35_;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = backing;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _vala_detected;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->image_dim;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->dim = _tmp38_;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _vala_detected;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_->metadata;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_ != NULL) {
-#line 10808 "Photo.c"
+#line 10823 "Photo.c"
 		DetectedPhotoInformation* _tmp42_ = NULL;
 		PhotoMetadata* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _vala_detected;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp42_->metadata;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = photo_metadata_get_orientation (_tmp43_);
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp44_;
-#line 10820 "Photo.c"
+#line 10835 "Photo.c"
 	} else {
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10824 "Photo.c"
+#line 10839 "Photo.c"
 	}
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->original_orientation = _tmp39_;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 10840 "Photo.c"
+#line 10855 "Photo.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10844 "Photo.c"
+#line 10859 "Photo.c"
 	}
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10848 "Photo.c"
+#line 10863 "Photo.c"
 }
 
 
 static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10859 "Photo.c"
+#line 10874 "Photo.c"
 	}
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10865 "Photo.c"
+#line 10880 "Photo.c"
 }
 
 
 static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10876 "Photo.c"
+#line 10891 "Photo.c"
 	}
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10882 "Photo.c"
+#line 10897 "Photo.c"
 }
 
 
 static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10893 "Photo.c"
+#line 10908 "Photo.c"
 	}
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10899 "Photo.c"
+#line 10914 "Photo.c"
 }
 
 
 static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10910 "Photo.c"
+#line 10925 "Photo.c"
 	}
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10916 "Photo.c"
+#line 10931 "Photo.c"
 }
 
 
 static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10927 "Photo.c"
+#line 10942 "Photo.c"
 	}
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10933 "Photo.c"
+#line 10948 "Photo.c"
 }
 
 
 static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10944 "Photo.c"
+#line 10959 "Photo.c"
 	}
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10950 "Photo.c"
+#line 10965 "Photo.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 10957 "Photo.c"
+#line 10972 "Photo.c"
 }
 
 
@@ -11018,256 +11033,256 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	gint _tmp124__length1 = 0;
 	PhotoReimportMasterStateImpl* _tmp125_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1410 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_reimport_state = NULL;
 #line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_reimport_state = NULL;
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_query_backing_photo_row (self, _tmp4_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, &_tmp5_, &_inner_error_);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp6_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 11058 "Photo.c"
+#line 11073 "Photo.c"
 	}
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 11064 "Photo.c"
+#line 11079 "Photo.c"
 		GFile* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1418: Unable to retrieve photo state from %s for reimport", _tmp10_);
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp10_);
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp10_);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11090 "Photo.c"
+#line 11105 "Photo.c"
 		} else {
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11094 "Photo.c"
+#line 11109 "Photo.c"
 		}
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11098 "Photo.c"
+#line 11113 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = detected;
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->colorspace;
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_ != GDK_COLORSPACE_RGB) {
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 11108 "Photo.c"
+#line 11123 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = detected;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_->channels;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp16_ < 3;
-#line 11118 "Photo.c"
+#line 11133 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 11124 "Photo.c"
+#line 11139 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = detected;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_->bits_per_channel;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp18_ != 8;
-#line 11134 "Photo.c"
+#line 11149 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 11138 "Photo.c"
+#line 11153 "Photo.c"
 		GFile* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = file;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = g_file_get_path (_tmp19_);
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1426: Not re-importing %s: Unsupported color format", _tmp21_);
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp21_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = FALSE;
+		g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp21_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp21_);
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = FALSE;
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11164 "Photo.c"
+#line 11179 "Photo.c"
 		} else {
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11168 "Photo.c"
+#line 11183 "Photo.c"
 		}
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11172 "Photo.c"
+#line 11187 "Photo.c"
 	}
-#line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = photo_row_new ();
-#line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	updated_row = _tmp22_;
-#line 11178 "Photo.c"
+#line 11193 "Photo.c"
 	{
 		PhotoRow* _tmp23_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = self->row;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11185 "Photo.c"
+#line 11200 "Photo.c"
 		{
 			PhotoRow* _tmp24_ = NULL;
 			PhotoRow* _tmp25_ = NULL;
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->row;
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = _photo_row_ref0 (_tmp24_);
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			updated_row = _tmp25_;
-#line 11197 "Photo.c"
+#line 11212 "Photo.c"
 		}
-		__finally303:
+		__finally304:
 		{
 			PhotoRow* _tmp26_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11206 "Photo.c"
+#line 11221 "Photo.c"
 		}
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 11222 "Photo.c"
+#line 11237 "Photo.c"
 		}
 	}
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_new0 (gchar*, 0 + 1);
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp27_;
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	list_length1 = 0;
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
-	_list_size_ = list_length1;
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+	_list_size_ = list_length1;
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = updated_row;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_->md5;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = detected;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_->md5;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_strcmp0 (_tmp29_, _tmp31_) != 0) {
-#line 11243 "Photo.c"
+#line 11258 "Photo.c"
 		gchar** _tmp32_ = NULL;
 		gint _tmp32__length1 = 0;
 		gchar* _tmp33_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = list;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32__length1 = list_length1;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = g_strdup ("metadata:md5");
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_);
-#line 11255 "Photo.c"
+#line 11270 "Photo.c"
 	}
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = updated_row;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_->master;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_->original_orientation;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = backing;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->original_orientation;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp36_ != _tmp38_) {
-#line 11269 "Photo.c"
+#line 11284 "Photo.c"
 		gchar** _tmp39_ = NULL;
 		gint _tmp39__length1 = 0;
 		gchar* _tmp40_ = NULL;
@@ -11275,33 +11290,33 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		BackingPhotoRow* _tmp42_ = NULL;
 		BackingPhotoRow* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39__length1 = list_length1;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("image:orientation");
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_);
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = updated_row;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp41_->master;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = backing;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp43_->original_orientation;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_->original_orientation = _tmp44_;
-#line 11295 "Photo.c"
+#line 11310 "Photo.c"
 	}
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = detected;
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = _tmp45_->metadata;
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_ != NULL) {
-#line 11303 "Photo.c"
+#line 11318 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
@@ -11327,204 +11342,204 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp78_ = NULL;
 		PhotoMetadata* _tmp79_ = NULL;
 		Rating _tmp80_ = 0;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = detected;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = photo_metadata_get_exposure_date_time (_tmp48_);
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp49_;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = date_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_ != NULL) {
-#line 11341 "Photo.c"
+#line 11356 "Photo.c"
 			PhotoRow* _tmp52_ = NULL;
 			time_t _tmp53_ = 0;
 			MetadataDateTime* _tmp54_ = NULL;
 			time_t _tmp55_ = 0;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = updated_row;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = _tmp52_->exposure_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = date_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = metadata_date_time_get_timestamp (_tmp54_);
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp53_ != _tmp55_;
-#line 11356 "Photo.c"
+#line 11371 "Photo.c"
 		} else {
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = FALSE;
-#line 11360 "Photo.c"
+#line 11375 "Photo.c"
 		}
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp50_) {
-#line 11364 "Photo.c"
+#line 11379 "Photo.c"
 			gchar** _tmp56_ = NULL;
 			gint _tmp56__length1 = 0;
 			gchar* _tmp57_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = list;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56__length1 = list_length1;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = g_strdup ("metadata:exposure-time");
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_);
-#line 11376 "Photo.c"
+#line 11391 "Photo.c"
 		}
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = updated_row;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_->title;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_->metadata;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = _tmp62_;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = g_strcmp0 (_tmp59_, _tmp63_) != 0;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp63_);
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp64_) {
-#line 11396 "Photo.c"
+#line 11411 "Photo.c"
 			gchar** _tmp65_ = NULL;
 			gint _tmp65__length1 = 0;
 			gchar* _tmp66_ = NULL;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = list;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65__length1 = list_length1;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = g_strdup ("metadata:name");
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_);
-#line 11408 "Photo.c"
+#line 11423 "Photo.c"
 		}
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = updated_row;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = _tmp67_->comment;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = detected;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_->metadata;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp73_ = g_strcmp0 (_tmp68_, _tmp72_) != 0;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp72_);
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp73_) {
-#line 11428 "Photo.c"
+#line 11443 "Photo.c"
 			gchar** _tmp74_ = NULL;
 			gint _tmp74__length1 = 0;
 			gchar* _tmp75_ = NULL;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = list;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74__length1 = list_length1;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = g_strdup ("metadata:comment");
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_);
-#line 11440 "Photo.c"
+#line 11455 "Photo.c"
 		}
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = updated_row;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = _tmp76_->rating;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = detected;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = _tmp78_->metadata;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = photo_metadata_get_rating (_tmp79_);
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp77_ != _tmp80_) {
-#line 11454 "Photo.c"
+#line 11469 "Photo.c"
 			gchar** _tmp81_ = NULL;
 			gint _tmp81__length1 = 0;
 			gchar* _tmp82_ = NULL;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = list;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81__length1 = list_length1;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = g_strdup ("metadata:rating");
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_);
-#line 11466 "Photo.c"
+#line 11481 "Photo.c"
 		}
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11470 "Photo.c"
+#line 11485 "Photo.c"
 	}
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp83_ = updated_row;
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp84_ = backing;
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = _backing_photo_row_ref0 (_tmp84_);
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp83_->master);
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp83_->master = _tmp85_;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = updated_row;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = detected;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = _tmp87_->md5;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = g_strdup (_tmp88_);
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp86_->md5);
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_->md5 = _tmp89_;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = updated_row;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = detected;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_->exif_md5;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = g_strdup (_tmp92_);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp90_->exif_md5);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_->exif_md5 = _tmp93_;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = updated_row;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = detected;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = _tmp95_->thumbnail_md5;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = g_strdup (_tmp96_);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp94_->thumbnail_md5);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp94_->thumbnail_md5 = _tmp97_;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp94_->thumbnail_md5 = _tmp97_;
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = NULL;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp98_ = detected;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp99_ = _tmp98_->metadata;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp99_ != NULL) {
-#line 11526 "Photo.c"
+#line 11541 "Photo.c"
 		DetectedPhotoInformation* _tmp100_ = NULL;
 		PhotoMetadata* _tmp101_ = NULL;
 		PhotoMetadata* _tmp102_ = NULL;
@@ -11545,180 +11560,180 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp119_ = NULL;
 		PhotoMetadata* _tmp120_ = NULL;
 		Rating _tmp121_ = 0;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = detected;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = _tmp100_->metadata;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = _media_metadata_ref0 (_tmp101_);
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
-		metadata = _tmp102_;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+		metadata = _tmp102_;
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = detected;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = _tmp103_->metadata;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_);
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp105_;
-#line 1473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = date_time;
-#line 1473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp106_ != NULL) {
-#line 11569 "Photo.c"
+#line 11584 "Photo.c"
 			PhotoRow* _tmp107_ = NULL;
 			MetadataDateTime* _tmp108_ = NULL;
 			time_t _tmp109_ = 0;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_ = updated_row;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = date_time;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_ = metadata_date_time_get_timestamp (_tmp108_);
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_->exposure_time = _tmp109_;
-#line 11581 "Photo.c"
+#line 11596 "Photo.c"
 		}
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp110_ = updated_row;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp111_ = detected;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp112_ = _tmp111_->metadata;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp113_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp110_->title);
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp110_->title = _tmp113_;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = updated_row;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = detected;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = _tmp115_->metadata;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp114_->comment);
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_->comment = _tmp117_;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = updated_row;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp119_ = detected;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp120_ = _tmp119_->metadata;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = photo_metadata_get_rating (_tmp120_);
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_->rating = _tmp121_;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11619 "Photo.c"
+#line 11634 "Photo.c"
 	}
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = updated_row;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp123_ = metadata;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = list;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124__length1 = list_length1;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = photo_reimport_master_state_impl_new (_tmp122_, _tmp123_, _tmp124_, _tmp124__length1);
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = (_vala_array_free (list, list_length1, (GDestroyNotify) g_free), NULL);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (updated_row);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (reimport_state) {
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		*reimport_state = _vala_reimport_state;
-#line 11653 "Photo.c"
+#line 11668 "Photo.c"
 	} else {
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11657 "Photo.c"
+#line 11672 "Photo.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11661 "Photo.c"
+#line 11676 "Photo.c"
 }
 
 
 static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 11670 "Photo.c"
+#line 11685 "Photo.c"
 }
 
 
 void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11679 "Photo.c"
+#line 11694 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11686 "Photo.c"
+#line 11701 "Photo.c"
 }
 
 
 static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11697 "Photo.c"
+#line 11712 "Photo.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11703 "Photo.c"
+#line 11718 "Photo.c"
 }
 
 
 static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11714 "Photo.c"
+#line 11729 "Photo.c"
 	}
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11720 "Photo.c"
+#line 11735 "Photo.c"
 }
 
 
@@ -11737,56 +11752,56 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	gboolean _tmp33_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl));
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
-	reimport_state = _tmp1_;
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+	reimport_state = _tmp1_;
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_table_get_instance ();
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state->row;
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp3_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11769 "Photo.c"
+#line 11784 "Photo.c"
 		} else {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11779 "Photo.c"
+#line 11794 "Photo.c"
 		}
 	}
 	{
 		PhotoRow* _tmp5_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = self->row;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11788 "Photo.c"
+#line 11803 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
 			PhotoRow* _tmp6_ = NULL;
@@ -11802,191 +11817,191 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			PhotoRow* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->master;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _backing_photo_row_ref0 (_tmp7_);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_master = _tmp8_;
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = reimport_state->row;
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _photo_row_ref0 (_tmp9_);
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (self->row);
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->row = _tmp10_;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = original_master;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_tmp11_->master);
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_->master = _tmp13_;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->master;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = reimport_state->row;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_->master;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_row_copy_from (_tmp15_, _tmp17_);
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = reimport_state->metadata_only;
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp18_) {
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 11846 "Photo.c"
+#line 11861 "Photo.c"
 			}
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11850 "Photo.c"
+#line 11865 "Photo.c"
 		}
-		__finally304:
+		__finally305:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11859 "Photo.c"
+#line 11874 "Photo.c"
 		}
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11871 "Photo.c"
+#line 11886 "Photo.c"
 			} else {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11881 "Photo.c"
+#line 11896 "Photo.c"
 			}
 		}
 	}
-#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = reimport_state->metadata;
-#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_ != NULL) {
-#line 11889 "Photo.c"
+#line 11904 "Photo.c"
 		PhotoMetadata* _tmp21_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = reimport_state->metadata;
-#line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11895 "Photo.c"
+#line 11910 "Photo.c"
 	}
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = reimport_state->metadata_only;
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp22_) {
-#line 11901 "Photo.c"
+#line 11916 "Photo.c"
 		gchar** _tmp23_ = NULL;
 		gint _tmp23__length1 = 0;
 		gchar* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state->alterations;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23__length1 = reimport_state->alterations_length1;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = g_strdup ("image:master");
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add94 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_);
-#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = photo_is_master_baseline (self);
-#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp25_) {
-#line 11918 "Photo.c"
+#line 11933 "Photo.c"
 			gchar** _tmp26_ = NULL;
 			gint _tmp26__length1 = 0;
 			gchar* _tmp27_ = NULL;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = reimport_state->alterations;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26__length1 = reimport_state->alterations_length1;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = g_strdup ("image:baseline");
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
-#line 11930 "Photo.c"
+#line 11945 "Photo.c"
 		}
 	}
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = reimport_state->alterations;
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28__length1 = reimport_state->alterations_length1;
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28__length1 > 0) {
-#line 11939 "Photo.c"
+#line 11954 "Photo.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		Alteration* _tmp30_ = NULL;
 		Alteration* _tmp31_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = reimport_state->alterations;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = reimport_state->alterations_length1;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1);
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp31_);
-#line 11956 "Photo.c"
+#line 11971 "Photo.c"
 	}
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_master_reimported (self, _tmp32_);
 #line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_master_reimported (self, _tmp32_);
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_is_master_baseline (self);
-#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_) {
-#line 11966 "Photo.c"
+#line 11981 "Photo.c"
 		PhotoMetadata* _tmp34_ = NULL;
-#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state->metadata;
-#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp34_);
-#line 11972 "Photo.c"
+#line 11987 "Photo.c"
 	}
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_is_master_source (self);
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 11978 "Photo.c"
+#line 11993 "Photo.c"
 		PhotoMetadata* _tmp36_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = reimport_state->metadata;
-#line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp36_);
-#line 11984 "Photo.c"
+#line 11999 "Photo.c"
 	}
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 11988 "Photo.c"
+#line 12003 "Photo.c"
 }
 
 
@@ -12005,175 +12020,175 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	DetectedPhotoInformation* _tmp8_ = NULL;
 	GdkColorspace _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (G_IS_FILE (file), FALSE);
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_query_backing_photo_row (self, _tmp1_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp2_, &_inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp2_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12027 "Photo.c"
+#line 12042 "Photo.c"
 	}
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_vala_backing);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_backing = _tmp4_;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_backing = _tmp4_;
+#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _vala_backing;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12049 "Photo.c"
+#line 12064 "Photo.c"
 		} else {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12053 "Photo.c"
+#line 12068 "Photo.c"
 		}
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12059 "Photo.c"
+#line 12074 "Photo.c"
 		} else {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12063 "Photo.c"
+#line 12078 "Photo.c"
 		}
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12067 "Photo.c"
+#line 12082 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _vala_detected;
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_->colorspace;
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != GDK_COLORSPACE_RGB) {
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = TRUE;
-#line 12077 "Photo.c"
+#line 12092 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _vala_detected;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_->channels;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < 3;
-#line 12087 "Photo.c"
+#line 12102 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 12093 "Photo.c"
+#line 12108 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _vala_detected;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_->bits_per_channel;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp13_ != 8;
-#line 12103 "Photo.c"
+#line 12118 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 12107 "Photo.c"
+#line 12122 "Photo.c"
 		GFile* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = file;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = g_file_get_path (_tmp14_);
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1538: Not re-importing %s: Unsupported color format", _tmp16_);
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp16_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = FALSE;
+		g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp16_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp16_);
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = FALSE;
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12129 "Photo.c"
+#line 12144 "Photo.c"
 		} else {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12133 "Photo.c"
+#line 12148 "Photo.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12139 "Photo.c"
+#line 12154 "Photo.c"
 		} else {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12143 "Photo.c"
+#line 12158 "Photo.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12147 "Photo.c"
+#line 12162 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp0_);
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (backing) {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*backing = _vala_backing;
-#line 12157 "Photo.c"
+#line 12172 "Photo.c"
 	} else {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12161 "Photo.c"
+#line 12176 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 12167 "Photo.c"
+#line 12182 "Photo.c"
 	} else {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12171 "Photo.c"
+#line 12186 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12175 "Photo.c"
+#line 12190 "Photo.c"
 }
 
 
@@ -12195,130 +12210,130 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	PhotoMetadata* _tmp9_ = NULL;
 	PhotoReimportEditableStateImpl* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1548 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_file (self);
-#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp0_;
-#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12219 "Photo.c"
+#line 12234 "Photo.c"
 		} else {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12223 "Photo.c"
+#line 12238 "Photo.c"
 		}
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12227 "Photo.c"
+#line 12242 "Photo.c"
 	}
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_verify_file_for_reimport (self, _tmp3_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp4_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp6_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12255 "Photo.c"
+#line 12270 "Photo.c"
 	}
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12271 "Photo.c"
+#line 12286 "Photo.c"
 		} else {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12275 "Photo.c"
+#line 12290 "Photo.c"
 		}
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12279 "Photo.c"
+#line 12294 "Photo.c"
 	}
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = detected;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_->metadata;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_reimport_editable_state_impl_new (_tmp7_, _tmp9_);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12305 "Photo.c"
+#line 12320 "Photo.c"
 	} else {
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12309 "Photo.c"
+#line 12324 "Photo.c"
 	}
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12313 "Photo.c"
+#line 12328 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12320 "Photo.c"
+#line 12335 "Photo.c"
 }
 
 
@@ -12345,81 +12360,81 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	gboolean _tmp46_ = FALSE;
 	gboolean _tmp49_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 1566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp0_);
-#line 1566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp0_;
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing_photo_id_is_invalid (&editable_id);
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12361 "Photo.c"
+#line 12376 "Photo.c"
 	}
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl));
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
-	reimport_state = _tmp3_;
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+	reimport_state = _tmp3_;
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state;
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->metadata_only;
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 12375 "Photo.c"
+#line 12390 "Photo.c"
 		BackingPhotoTable* _tmp6_ = NULL;
 		BackingPhotoTable* _tmp7_ = NULL;
 		PhotoReimportEditableStateImpl* _tmp8_ = NULL;
 		BackingPhotoRow* _tmp9_ = NULL;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = backing_photo_table_get_instance ();
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = reimport_state;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->backing_state;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp7_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12402 "Photo.c"
+#line 12417 "Photo.c"
 			} else {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12412 "Photo.c"
+#line 12427 "Photo.c"
 			}
 		}
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12421 "Photo.c"
+#line 12436 "Photo.c"
 			{
 				PhotoReimportEditableStateImpl* _tmp11_ = NULL;
 				BackingPhotoRow* _tmp12_ = NULL;
@@ -12427,58 +12442,58 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				PhotoReimportEditableStateImpl* _tmp14_ = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				Orientation _tmp16_ = 0;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = reimport_state;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->backing_state;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (self->priv->editable);
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->editable = _tmp13_;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = reimport_state;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing_state;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_set_orientation (self, _tmp16_);
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 12449 "Photo.c"
+#line 12464 "Photo.c"
 			}
-			__finally305:
+			__finally306:
 			{
 				PhotoRow* _tmp17_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12458 "Photo.c"
+#line 12473 "Photo.c"
 			}
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12470 "Photo.c"
+#line 12485 "Photo.c"
 				} else {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12480 "Photo.c"
+#line 12495 "Photo.c"
 				}
 			}
 		}
@@ -12486,23 +12501,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		PhotoReimportEditableStateImpl* _tmp18_ = NULL;
 		BackingPhotoRow* _tmp19_ = NULL;
 		Orientation _tmp20_ = 0;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = reimport_state;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->backing_state;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_->original_orientation;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_orientation (self, _tmp20_);
-#line 12496 "Photo.c"
+#line 12511 "Photo.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = _tmp21_->metadata;
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 12504 "Photo.c"
+#line 12519 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp23_ = NULL;
 		PhotoMetadata* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
@@ -12516,127 +12531,127 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		Rating _tmp33_ = 0;
 		PhotoReimportEditableStateImpl* _tmp34_ = NULL;
 		PhotoMetadata* _tmp35_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _tmp23_->metadata;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_);
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp26_);
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = reimport_state;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->metadata;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = _tmp29_;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_);
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp30_);
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = reimport_state;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_->metadata;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = photo_metadata_get_rating (_tmp32_);
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_);
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = _tmp34_->metadata;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12556 "Photo.c"
+#line 12571 "Photo.c"
 	}
-#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp36_;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = reimport_state;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->metadata_only;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 12568 "Photo.c"
+#line 12583 "Photo.c"
 		const gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL);
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp40_;
-#line 12579 "Photo.c"
+#line 12594 "Photo.c"
 	}
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = alteration_new_from_list (_tmp41_);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp43_);
 #line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp43_);
+#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = reimport_state;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->metadata;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_editable_reimported (self, _tmp45_);
 #line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_editable_reimported (self, _tmp45_);
+#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = photo_is_editable_baseline (self);
-#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 12601 "Photo.c"
+#line 12616 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = reimport_state;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12610 "Photo.c"
+#line 12625 "Photo.c"
 	}
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_is_editable_source (self);
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp49_) {
-#line 12616 "Photo.c"
+#line 12631 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp50_ = NULL;
 		PhotoMetadata* _tmp51_ = NULL;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = reimport_state;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_->metadata;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12625 "Photo.c"
+#line 12640 "Photo.c"
 	}
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12631 "Photo.c"
+#line 12646 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12638 "Photo.c"
+#line 12653 "Photo.c"
 }
 
 
@@ -12653,56 +12668,56 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	PhotoReimportRawDevelopmentStateImpl* _tmp20_ = NULL;
 	gint _tmp21_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_raw_developer_files (self);
-#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = _tmp0_;
-#line 1611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = files;
-#line 1611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (files);
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12677 "Photo.c"
+#line 12692 "Photo.c"
 		} else {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12681 "Photo.c"
+#line 12696 "Photo.c"
 		}
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12685 "Photo.c"
+#line 12700 "Photo.c"
 	}
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_reimport_raw_development_state_impl_new ();
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12691 "Photo.c"
+#line 12706 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = files;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_file_it = _tmp4_;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12704 "Photo.c"
+#line 12719 "Photo.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			GFile* file = NULL;
@@ -12719,121 +12734,121 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			BackingPhotoRow* _tmp15_ = NULL;
 			DetectedPhotoInformation* _tmp16_ = NULL;
 			PhotoMetadata* _tmp17_ = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _file_it;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp6_) {
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12729 "Photo.c"
+#line 12744 "Photo.c"
 			}
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			file = (GFile*) _tmp8_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = file;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp11_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			detected = _tmp12_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp13_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_file_it);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (files);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 12769 "Photo.c"
+#line 12784 "Photo.c"
 			}
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				continue;
-#line 12781 "Photo.c"
+#line 12796 "Photo.c"
 			}
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = reimport_state;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = detected;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_->metadata;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12799 "Photo.c"
+#line 12814 "Photo.c"
 		}
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12803 "Photo.c"
+#line 12818 "Photo.c"
 	}
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = reimport_state;
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState));
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp19_;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = reimport_state;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_reimport_raw_development_state_impl_get_size (_tmp20_);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp21_ > 0;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (files);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12827 "Photo.c"
+#line 12842 "Photo.c"
 	} else {
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12831 "Photo.c"
+#line 12846 "Photo.c"
 	}
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12835 "Photo.c"
+#line 12850 "Photo.c"
 }
 
 
@@ -12850,41 +12865,41 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	Alteration* _tmp38_ = NULL;
 	Alteration* _tmp39_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state));
-#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12862 "Photo.c"
+#line 12877 "Photo.c"
 	}
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl));
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12870 "Photo.c"
+#line 12885 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
 		PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reimport_state;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_->list;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_dev_it = _tmp5_;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12886 "Photo.c"
+#line 12901 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
@@ -12892,105 +12907,105 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			gpointer _tmp9_ = NULL;
 			PhotoReimportRawDevelopmentStateImpl* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _dev_it;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12902 "Photo.c"
+#line 12917 "Photo.c"
 			}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = reimport_state;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_->metadata_only;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp11_) {
-#line 12916 "Photo.c"
+#line 12931 "Photo.c"
 				BackingPhotoTable* _tmp12_ = NULL;
 				BackingPhotoTable* _tmp13_ = NULL;
 				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = backing_photo_table_get_instance ();
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp13_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_propagate_error (error, _inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12947 "Photo.c"
+#line 12962 "Photo.c"
 					} else {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_clear_error (&_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12961 "Photo.c"
+#line 12976 "Photo.c"
 					}
 				}
 				{
 					PhotoRow* _tmp16_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12970 "Photo.c"
+#line 12985 "Photo.c"
 					{
 						gint _tmp17_ = 0;
 						RawDeveloper* _tmp18_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 12976 "Photo.c"
+#line 12991 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
 							gint _d_collection_size_ = 0;
 							gint d_it = 0;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = _tmp18_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection_length1 = _tmp17_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 12988 "Photo.c"
+#line 13003 "Photo.c"
 								RawDeveloper d = 0;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 12992 "Photo.c"
+#line 13007 "Photo.c"
 								{
 									BackingPhotoID id = {0};
 									PhotoRow* _tmp19_ = NULL;
@@ -13000,154 +13015,154 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 									BackingPhotoID _tmp22_ = {0};
 									BackingPhotoID _tmp23_ = {0};
 									gint64 _tmp24_ = 0LL;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp19_ = self->row;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20_ = _tmp19_->development_ids;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20__length1 = _tmp19_->development_ids_length1;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp21_ = d;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp22_ = _tmp20_[_tmp21_];
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									id = _tmp22_;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp23_ = id;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp24_ = _tmp23_.id;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13020 "Photo.c"
+#line 13035 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
 										BackingPhotoID _tmp25_ = {0};
 										BackingPhotoRow* _tmp26_ = NULL;
 										BackingPhotoRow* _tmp27_ = NULL;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp25_ = id;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp26_ = photo_get_backing_row (self, &_tmp25_);
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										bpr = _tmp26_;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp27_ = bpr;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13035 "Photo.c"
+#line 13050 "Photo.c"
 											GeeHashMap* _tmp28_ = NULL;
 											RawDeveloper _tmp29_ = 0;
 											BackingPhotoRow* _tmp30_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp28_ = self->priv->developments;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp29_ = d;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp30_ = bpr;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_);
-#line 13047 "Photo.c"
+#line 13062 "Photo.c"
 										}
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13051 "Photo.c"
+#line 13066 "Photo.c"
 									}
 								}
 							}
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13057 "Photo.c"
+#line 13072 "Photo.c"
 						}
 					}
-					__finally306:
+					__finally307:
 					{
 						PhotoRow* _tmp31_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->row;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13067 "Photo.c"
+#line 13082 "Photo.c"
 					}
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_propagate_error (error, _inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13083 "Photo.c"
+#line 13098 "Photo.c"
 						} else {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_clear_error (&_inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13097 "Photo.c"
+#line 13112 "Photo.c"
 						}
 					}
 				}
 			}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13104 "Photo.c"
+#line 13119 "Photo.c"
 		}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13108 "Photo.c"
+#line 13123 "Photo.c"
 	}
-#line 1654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp32_;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = reimport_state;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->metadata_only;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp34_) {
-#line 13120 "Photo.c"
+#line 13135 "Photo.c"
 		const gchar* _tmp35_ = NULL;
 		gchar* _tmp36_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = list;
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL);
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp36_;
-#line 13131 "Photo.c"
+#line 13146 "Photo.c"
 	}
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = alteration_new_from_list (_tmp37_);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp39_);
 #line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp39_);
+#line 1662 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_raw_development_modified (self);
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13149 "Photo.c"
+#line 13164 "Photo.c"
 }
 
 
@@ -13155,15 +13170,15 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13165 "Photo.c"
+#line 13180 "Photo.c"
 }
 
 
@@ -13172,17 +13187,17 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 1667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp0_);
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13184 "Photo.c"
+#line 13199 "Photo.c"
 }
 
 
@@ -13194,25 +13209,25 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	gint64 _tmp2_ = 0LL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13214 "Photo.c"
+#line 13229 "Photo.c"
 }
 
 
@@ -13222,25 +13237,25 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	GTimeVal _tmp1_ = {0};
 	gboolean _tmp21_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 13234 "Photo.c"
+#line 13249 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13242 "Photo.c"
+#line 13257 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
@@ -13257,148 +13272,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				BackingPhotoRow* _tmp16_ = NULL;
 				GTimeVal _tmp17_ = {0};
 				glong _tmp18_ = 0L;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->master;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->timestamp;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = modification;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_.tv_sec;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13271 "Photo.c"
+#line 13286 "Photo.c"
 					{
 						PhotoRow* _tmp8_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13278 "Photo.c"
+#line 13293 "Photo.c"
 					}
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13282 "Photo.c"
+#line 13297 "Photo.c"
 				}
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->photo_id;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = modification;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_.tv_sec;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_);
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp10_);
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13302 "Photo.c"
-					goto __finally308;
+#line 13317 "Photo.c"
+					goto __finally309;
 				}
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->master;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13315 "Photo.c"
+#line 13330 "Photo.c"
 			}
-			__finally308:
+			__finally309:
 			{
 				PhotoRow* _tmp19_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13324 "Photo.c"
+#line 13339 "Photo.c"
 			}
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13330 "Photo.c"
-					goto __catch307_database_error;
+#line 13345 "Photo.c"
+					goto __catch308_database_error;
 				}
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13339 "Photo.c"
+#line 13354 "Photo.c"
 			}
 		}
 	}
-	goto __finally307;
-	__catch307_database_error:
+	goto __finally308;
+	__catch308_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = err;
-#line 1691 "/home/jens/Source/shotwell/src/Photo.vala"
-		app_window_database_error (_tmp20_);
 #line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+		app_window_database_error (_tmp20_);
+#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13360 "Photo.c"
+#line 13375 "Photo.c"
 	}
-	__finally307:
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally308:
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13371 "Photo.c"
+#line 13386 "Photo.c"
 	}
-#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_is_master_baseline (self);
-#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 13377 "Photo.c"
+#line 13392 "Photo.c"
 		Alteration* _tmp22_ = NULL;
 		Alteration* _tmp23_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp");
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp23_);
-#line 13388 "Photo.c"
+#line 13403 "Photo.c"
 	} else {
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("metadata", "master-timestamp");
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 13400 "Photo.c"
+#line 13415 "Photo.c"
 	}
 }
 
@@ -13410,60 +13425,60 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	gboolean altered = FALSE;
 	gboolean _tmp20_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
-	modification = _tmp1_;
 #line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
+	modification = _tmp1_;
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 13424 "Photo.c"
+#line 13439 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13431 "Photo.c"
+#line 13446 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
 			PhotoRow* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13442 "Photo.c"
+#line 13457 "Photo.c"
 				BackingPhotoRow* _tmp6_ = NULL;
 				time_t _tmp7_ = 0;
 				GTimeVal _tmp8_ = {0};
 				glong _tmp9_ = 0L;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->editable;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->timestamp;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = modification;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_.tv_sec;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13457 "Photo.c"
+#line 13472 "Photo.c"
 			} else {
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13461 "Photo.c"
+#line 13476 "Photo.c"
 			}
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13465 "Photo.c"
+#line 13480 "Photo.c"
 				BackingPhotoTable* _tmp10_ = NULL;
 				BackingPhotoTable* _tmp11_ = NULL;
 				PhotoRow* _tmp12_ = NULL;
@@ -13473,96 +13488,96 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				BackingPhotoRow* _tmp16_ = NULL;
 				GTimeVal _tmp17_ = {0};
 				glong _tmp18_ = 0L;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = backing_photo_table_get_instance ();
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->editable_id;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = modification;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_.tv_sec;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13493 "Photo.c"
-					goto __finally309;
+#line 13508 "Photo.c"
+					goto __finally310;
 				}
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 1712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered = TRUE;
-#line 13506 "Photo.c"
+#line 13521 "Photo.c"
 			}
 		}
-		__finally309:
+		__finally310:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13516 "Photo.c"
+#line 13531 "Photo.c"
 		}
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13526 "Photo.c"
+#line 13541 "Photo.c"
 			} else {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13534 "Photo.c"
+#line 13549 "Photo.c"
 			}
 		}
 	}
-#line 1716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = altered;
-#line 1716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 13542 "Photo.c"
+#line 13557 "Photo.c"
 		Alteration* _tmp21_ = NULL;
 		Alteration* _tmp22_ = NULL;
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp");
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp21_;
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp22_);
-#line 13553 "Photo.c"
+#line 13568 "Photo.c"
 	}
 }
 
 
 void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 1721 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (GEE_IS_MAP (map));
 #line 1723 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (GEE_IS_MAP (map));
+#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 13564 "Photo.c"
+#line 13579 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -13571,25 +13586,25 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = map;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 13591 "Photo.c"
+#line 13606 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -13600,90 +13615,90 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			Photo* _tmp12_ = NULL;
 			gpointer _tmp13_ = NULL;
 			GFileInfo* _tmp14_ = NULL;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13610 "Photo.c"
+#line 13625 "Photo.c"
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (Photo*) _tmp9_;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = map;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = gee_map_get (_tmp11_, _tmp12_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = (GFileInfo*) _tmp13_;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp14_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13644 "Photo.c"
+#line 13659 "Photo.c"
 				} else {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13656 "Photo.c"
+#line 13671 "Photo.c"
 				}
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13661 "Photo.c"
+#line 13676 "Photo.c"
 		}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13665 "Photo.c"
+#line 13680 "Photo.c"
 	}
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13677 "Photo.c"
+#line 13692 "Photo.c"
 		} else {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13685 "Photo.c"
+#line 13700 "Photo.c"
 		}
 	}
 }
@@ -13695,34 +13710,34 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	PhotoFileFormat _tmp0_ = 0;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_file_format (self);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write_image (_tmp1_);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 13705 "Photo.c"
+#line 13720 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_file_format (self);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 13711 "Photo.c"
+#line 13726 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
-#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 13718 "Photo.c"
+#line 13733 "Photo.c"
 	}
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13724 "Photo.c"
+#line 13739 "Photo.c"
 }
 
 
@@ -13735,35 +13750,35 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp2_, &_inner_error_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 13753 "Photo.c"
+#line 13768 "Photo.c"
 	}
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13765 "Photo.c"
+#line 13780 "Photo.c"
 }
 
 
@@ -13772,41 +13787,41 @@ gboolean photo_is_file_image (GFile* file) {
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_is_file_supported (_tmp1_);
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13784 "Photo.c"
+#line 13799 "Photo.c"
 	} else {
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS));
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13802 "Photo.c"
+#line 13817 "Photo.c"
 	}
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13808 "Photo.c"
+#line 13823 "Photo.c"
 }
 
 
@@ -13822,102 +13837,102 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	gchar* _tmp5_ = NULL;
 	gchar** _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (basename != NULL, FALSE);
 #line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (basename != NULL, FALSE);
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp1_;
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp2_;
-#line 1749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ext;
-#line 1749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 13850 "Photo.c"
+#line 13865 "Photo.c"
 	}
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp5_;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = extensions;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6__length1 = extensions_length1;
-#line 13864 "Photo.c"
+#line 13879 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection = _tmp6_;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection_length1 = _tmp6__length1;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13876 "Photo.c"
+#line 13891 "Photo.c"
 			gchar* _tmp7_ = NULL;
 			gchar* extension = NULL;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = g_strdup (extension_collection[extension_it]);
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			extension = _tmp7_;
-#line 13883 "Photo.c"
+#line 13898 "Photo.c"
 			{
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = ext;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = extension;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (extension);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (ext);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (name);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 13903 "Photo.c"
+#line 13918 "Photo.c"
 				}
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13907 "Photo.c"
+#line 13922 "Photo.c"
 			}
 		}
 	}
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13919 "Photo.c"
+#line 13934 "Photo.c"
 }
 
 
@@ -13931,31 +13946,31 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
 	PhotoFileFormat _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13957 "Photo.c"
+#line 13972 "Photo.c"
 }
 
 
@@ -13973,43 +13988,43 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
 	gint _tmp8__length1 = 0;
 	PhotoID* _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 1776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8__length1 = _tmp6_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9__length1 = _tmp8__length1;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp9__length1;
-#line 14005 "Photo.c"
+#line 14020 "Photo.c"
 	}
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp9_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14011 "Photo.c"
+#line 14026 "Photo.c"
 }
 
 
@@ -14018,19 +14033,19 @@ gint64 photo_get_photo_key (DataSource* source) {
 	DataSource* _tmp0_ = NULL;
 	PhotoID _tmp1_ = {0};
 	gint64 _tmp2_ = 0LL;
-#line 1786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp1_);
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14032 "Photo.c"
+#line 14047 "Photo.c"
 }
 
 
@@ -14041,91 +14056,91 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14059 "Photo.c"
+#line 14074 "Photo.c"
 }
 
 
 static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14070 "Photo.c"
+#line 14085 "Photo.c"
 	}
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14076 "Photo.c"
+#line 14091 "Photo.c"
 }
 
 
 static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14087 "Photo.c"
+#line 14102 "Photo.c"
 	}
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14093 "Photo.c"
+#line 14108 "Photo.c"
 }
 
 
 static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14104 "Photo.c"
+#line 14119 "Photo.c"
 	}
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14110 "Photo.c"
+#line 14125 "Photo.c"
 }
 
 
 static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14121 "Photo.c"
+#line 14136 "Photo.c"
 	}
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14127 "Photo.c"
+#line 14142 "Photo.c"
 }
 
 
@@ -14140,43 +14155,43 @@ void photo_set_master_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp41_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
-	filepath = _tmp1_;
 #line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
+	filepath = _tmp1_;
+#line 1816 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 	name_changed = FALSE;
-#line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14162 "Photo.c"
+#line 14177 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14170 "Photo.c"
+#line 14185 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14178 "Photo.c"
+#line 14193 "Photo.c"
 					{
 						PhotoBackingReaders* _tmp4_ = NULL;
 						PhotoFileReader* _tmp5_ = NULL;
@@ -14184,25 +14199,25 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						GFile* _tmp7_ = NULL;
 						GFile* _tmp8_ = NULL;
 						gboolean _tmp9_ = FALSE;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp4_ = self->priv->readers;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = _tmp4_->master;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp6_;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp7_ = file;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = old_file;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp9_) {
-#line 14204 "Photo.c"
+#line 14219 "Photo.c"
 							PhotoTable* _tmp10_ = NULL;
 							PhotoTable* _tmp11_ = NULL;
 							PhotoID _tmp12_ = {0};
@@ -14225,196 +14240,196 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							PhotoRow* _tmp29_ = NULL;
 							const gchar* _tmp30_ = NULL;
 							gboolean _tmp31_ = FALSE;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp10_ = photo_table_get_instance ();
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = _tmp10_;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_get_photo_id (self, &_tmp12_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = filepath;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp11_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14241 "Photo.c"
-								goto __finally312;
+#line 14256 "Photo.c"
+								goto __finally313;
 							}
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = _tmp14_->master;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = filepath;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = g_strdup (_tmp16_);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp15_->filepath);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_->filepath = _tmp17_;
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = file;
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = g_file_get_basename (_tmp18_);
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (self->priv->file_title);
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							self->priv->file_title = _tmp19_;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = self->priv->readers;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->row;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->master;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _tmp22_->file_format;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = filepath;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp20_->master);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp20_->master = _tmp25_;
 #line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp20_->master = _tmp25_;
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = photo_is_master_baseline (self);
-#line 1831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp26_;
-#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo_is_master_source (self);
-#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp27_;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = self->row;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _tmp29_->title;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = is_string_empty (_tmp30_);
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp31_) {
-#line 14298 "Photo.c"
+#line 14313 "Photo.c"
 								GFile* _tmp32_ = NULL;
 								gchar* _tmp33_ = NULL;
 								gchar* _tmp34_ = NULL;
 								GFile* _tmp35_ = NULL;
 								gchar* _tmp36_ = NULL;
 								gchar* _tmp37_ = NULL;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp32_ = old_file;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp33_ = g_file_get_basename (_tmp32_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp34_ = _tmp33_;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp35_ = file;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp36_ = g_file_get_basename (_tmp35_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp37_ = _tmp36_;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp37_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp34_);
-#line 14323 "Photo.c"
+#line 14338 "Photo.c"
 							} else {
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14327 "Photo.c"
+#line 14342 "Photo.c"
 							}
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14331 "Photo.c"
+#line 14346 "Photo.c"
 						}
 					}
-					__finally312:
+					__finally313:
 					{
 						PhotoBackingReaders* _tmp38_ = NULL;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = self->priv->readers;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14341 "Photo.c"
+#line 14356 "Photo.c"
 					}
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14345 "Photo.c"
-						goto __finally311;
+#line 14360 "Photo.c"
+						goto __finally312;
 					}
 				}
 			}
-			__finally311:
+			__finally312:
 			{
 				PhotoRow* _tmp39_ = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14357 "Photo.c"
+#line 14372 "Photo.c"
 			}
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14363 "Photo.c"
-					goto __catch310_database_error;
+#line 14378 "Photo.c"
+					goto __catch311_database_error;
 				}
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14376 "Photo.c"
+#line 14391 "Photo.c"
 			}
 		}
 	}
-	goto __finally310;
-	__catch310_database_error:
+	goto __finally311;
+	__catch311_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp40_ = NULL;
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp40_);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14395 "Photo.c"
+#line 14410 "Photo.c"
 	}
-	__finally310:
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally311:
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14410 "Photo.c"
+#line 14425 "Photo.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = altered;
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 14416 "Photo.c"
+#line 14431 "Photo.c"
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 		gboolean _tmp44_ = FALSE;
@@ -14432,162 +14447,162 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		gint _tmp57__length1 = 0;
 		Alteration* _tmp58_ = NULL;
 		Alteration* _tmp59_ = NULL;
-#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = old_file;
-#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = file;
-#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_);
 #line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+		media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_);
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_baseline;
-#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 1846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14446 "Photo.c"
+#line 14461 "Photo.c"
 		}
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp45_;
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = alteration_list;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46__length1 = alteration_list_length1;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = g_strdup ("backing:master");
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
-#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = name_changed;
-#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14468 "Photo.c"
+#line 14483 "Photo.c"
 			gchar** _tmp49_ = NULL;
 			gint _tmp49__length1 = 0;
 			gchar* _tmp50_ = NULL;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = alteration_list;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49__length1 = alteration_list_length1;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = g_strdup ("metadata:name");
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14480 "Photo.c"
+#line 14495 "Photo.c"
 		}
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = is_source;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_) {
-#line 14486 "Photo.c"
+#line 14501 "Photo.c"
 			gchar** _tmp52_ = NULL;
 			gint _tmp52__length1 = 0;
 			gchar* _tmp53_ = NULL;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = alteration_list;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52__length1 = alteration_list_length1;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = g_strdup ("backing:source");
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14498 "Photo.c"
+#line 14513 "Photo.c"
 		}
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = is_baseline;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp54_) {
-#line 14504 "Photo.c"
+#line 14519 "Photo.c"
 			gchar** _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
 			gchar* _tmp56_ = NULL;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = alteration_list;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55__length1 = alteration_list_length1;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = g_strdup ("backing:baseline");
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14516 "Photo.c"
+#line 14531 "Photo.c"
 		}
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57__length1 = alteration_list_length1;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1);
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_);
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp59_);
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14532 "Photo.c"
+#line 14547 "Photo.c"
 	}
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14538 "Photo.c"
+#line 14553 "Photo.c"
 }
 
 
 static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14549 "Photo.c"
+#line 14564 "Photo.c"
 	}
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14555 "Photo.c"
+#line 14570 "Photo.c"
 }
 
 
 static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14566 "Photo.c"
+#line 14581 "Photo.c"
 	}
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14572 "Photo.c"
+#line 14587 "Photo.c"
 }
 
 
 static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14583 "Photo.c"
+#line 14598 "Photo.c"
 	}
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14589 "Photo.c"
+#line 14604 "Photo.c"
 }
 
 
@@ -14601,41 +14616,41 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp34_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
-	filepath = _tmp1_;
 #line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
+	filepath = _tmp1_;
+#line 1873 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14621 "Photo.c"
+#line 14636 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14629 "Photo.c"
+#line 14644 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14637 "Photo.c"
+#line 14652 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
 						PhotoBackingReaders* _tmp5_ = NULL;
@@ -14643,65 +14658,65 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						GFile* _tmp10_ = NULL;
 						gboolean _tmp11_ = FALSE;
 						GFile* _tmp12_ = NULL;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = self->priv->readers;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = _tmp5_->editable;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14651 "Photo.c"
+#line 14666 "Photo.c"
 							PhotoBackingReaders* _tmp7_ = NULL;
 							PhotoFileReader* _tmp8_ = NULL;
 							GFile* _tmp9_ = NULL;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp7_ = self->priv->readers;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp8_ = _tmp7_->editable;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = _tmp9_;
-#line 14665 "Photo.c"
+#line 14680 "Photo.c"
 						} else {
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = NULL;
-#line 14671 "Photo.c"
+#line 14686 "Photo.c"
 						}
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp10_;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = old_file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp12_ != NULL) {
-#line 14683 "Photo.c"
+#line 14698 "Photo.c"
 							GFile* _tmp13_ = NULL;
 							GFile* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = old_file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = !_tmp15_;
-#line 14695 "Photo.c"
+#line 14710 "Photo.c"
 						} else {
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14699 "Photo.c"
+#line 14714 "Photo.c"
 						}
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14703 "Photo.c"
+#line 14718 "Photo.c"
 							BackingPhotoTable* _tmp16_ = NULL;
 							BackingPhotoTable* _tmp17_ = NULL;
 							PhotoRow* _tmp18_ = NULL;
@@ -14717,150 +14732,150 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							PhotoFileReader* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							gboolean _tmp30_ = FALSE;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = backing_photo_table_get_instance ();
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _tmp16_;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = self->row;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _tmp18_->editable_id;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = filepath;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp17_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
-#line 14737 "Photo.c"
-								goto __finally315;
+#line 14752 "Photo.c"
+								goto __finally316;
 							}
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = filepath;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = g_strdup (_tmp22_);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp21_->filepath);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_->filepath = _tmp23_;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = self->priv->readers;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->editable;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = _tmp25_->file_format;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = filepath;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_);
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp24_->editable);
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp24_->editable = _tmp28_;
 #line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp24_->editable = _tmp28_;
+#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = photo_is_editable_baseline (self);
-#line 1886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp29_;
-#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = photo_is_editable_source (self);
-#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp30_;
-#line 14774 "Photo.c"
+#line 14789 "Photo.c"
 						}
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14778 "Photo.c"
+#line 14793 "Photo.c"
 					}
-					__finally315:
+					__finally316:
 					{
 						PhotoBackingReaders* _tmp31_ = NULL;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->priv->readers;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14787 "Photo.c"
+#line 14802 "Photo.c"
 					}
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14791 "Photo.c"
-						goto __finally314;
+#line 14806 "Photo.c"
+						goto __finally315;
 					}
 				}
 			}
-			__finally314:
+			__finally315:
 			{
 				PhotoRow* _tmp32_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->row;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14803 "Photo.c"
+#line 14818 "Photo.c"
 			}
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14809 "Photo.c"
-					goto __catch313_database_error;
+#line 14824 "Photo.c"
+					goto __catch314_database_error;
 				}
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14822 "Photo.c"
+#line 14837 "Photo.c"
 			}
 		}
 	}
-	goto __finally313;
-	__catch313_database_error:
+	goto __finally314;
+	__catch314_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp33_ = NULL;
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = err;
-#line 1892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp33_);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14841 "Photo.c"
+#line 14856 "Photo.c"
 	}
-	__finally313:
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally314:
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14856 "Photo.c"
+#line 14871 "Photo.c"
 	}
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = altered;
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp34_) {
-#line 14862 "Photo.c"
+#line 14877 "Photo.c"
 		GFile* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
 		gboolean _tmp37_ = FALSE;
@@ -14877,93 +14892,93 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		gint _tmp47__length1 = 0;
 		Alteration* _tmp48_ = NULL;
 		Alteration* _tmp49_ = NULL;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = old_file;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = file;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_editable_replaced (self, _tmp35_, _tmp36_);
 #line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_notify_editable_replaced (self, _tmp35_, _tmp36_);
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = is_baseline;
-#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_) {
-#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14891 "Photo.c"
+#line 14906 "Photo.c"
 		}
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp38_;
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = alteration_list;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39__length1 = alteration_list_length1;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("backing:editable");
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
+#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = is_baseline;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14913 "Photo.c"
+#line 14928 "Photo.c"
 			gchar** _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 			gchar* _tmp43_ = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = alteration_list;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42__length1 = alteration_list_length1;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = g_strdup ("backing:baseline");
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14925 "Photo.c"
+#line 14940 "Photo.c"
 		}
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_source;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 14931 "Photo.c"
+#line 14946 "Photo.c"
 			gchar** _tmp45_ = NULL;
 			gint _tmp45__length1 = 0;
 			gchar* _tmp46_ = NULL;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = alteration_list;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45__length1 = alteration_list_length1;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp46_ = g_strdup ("backing:source");
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 14943 "Photo.c"
+#line 14958 "Photo.c"
 		}
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47__length1 = alteration_list_length1;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1);
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_);
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp49_);
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14959 "Photo.c"
+#line 14974 "Photo.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14965 "Photo.c"
+#line 14980 "Photo.c"
 }
 
 
@@ -14972,19 +14987,19 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	GeeMap* _tmp0_ = NULL;
 	GeeMapIterator* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1916 "/home/jens/Source/shotwell/src/Photo.vala"
-	database_table_begin_transaction ();
 #line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+	database_table_begin_transaction ();
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = map;
-#line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_map_map_iterator (_tmp0_);
-#line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	map_iter = _tmp1_;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 	while (TRUE) {
-#line 14986 "Photo.c"
+#line 15001 "Photo.c"
 		GeeMapIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		GeeMapIterator* _tmp4_ = NULL;
@@ -14993,64 +15008,64 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		GeeMapIterator* _tmp7_ = NULL;
 		gpointer _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = map_iter;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_map_iterator_next (_tmp2_);
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp3_) {
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15003 "Photo.c"
+#line 15018 "Photo.c"
 		}
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_map_iterator_get_key (_tmp4_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = (Photo*) _tmp5_;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = map_iter;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = gee_map_iterator_get_value (_tmp7_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = (GFile*) _tmp8_;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_editable_file (_tmp6_, _tmp9_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 15023 "Photo.c"
+#line 15038 "Photo.c"
 	}
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15037 "Photo.c"
+#line 15052 "Photo.c"
 		} else {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15047 "Photo.c"
+#line 15062 "Photo.c"
 		}
 	}
-#line 1915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15052 "Photo.c"
+#line 15067 "Photo.c"
 }
 
 
@@ -15060,23 +15075,23 @@ GFile* photo_get_actual_file (Photo* self) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_baseline_reader (self);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15078 "Photo.c"
+#line 15093 "Photo.c"
 }
 
 
@@ -15087,23 +15102,23 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15105 "Photo.c"
+#line 15120 "Photo.c"
 }
 
 
@@ -15113,42 +15128,42 @@ GFile* photo_get_editable_file (Photo* self) {
 	PhotoFileReader* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_ = NULL;
-#line 1935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15125 "Photo.c"
+#line 15140 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15136 "Photo.c"
+#line 15151 "Photo.c"
 	} else {
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 15142 "Photo.c"
+#line 15157 "Photo.c"
 	}
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15150 "Photo.c"
+#line 15165 "Photo.c"
 }
 
 
@@ -15158,30 +15173,30 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 	GeeArrayList* ret = NULL;
 	GeeArrayList* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15170 "Photo.c"
+#line 15185 "Photo.c"
 	}
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
-#line 15176 "Photo.c"
+#line 15191 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15183 "Photo.c"
+#line 15198 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
@@ -15191,25 +15206,25 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				GeeCollection* _tmp6_ = NULL;
 				GeeIterator* _tmp7_ = NULL;
 				GeeIterator* _tmp8_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp6_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_row_it = _tmp8_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15211 "Photo.c"
+#line 15226 "Photo.c"
 					GeeIterator* _tmp9_ = NULL;
 					gboolean _tmp10_ = FALSE;
 					BackingPhotoRow* row = NULL;
@@ -15220,72 +15235,72 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					const gchar* _tmp15_ = NULL;
 					GFile* _tmp16_ = NULL;
 					GFile* _tmp17_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = _row_it;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = gee_iterator_next (_tmp9_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!_tmp10_) {
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15230 "Photo.c"
+#line 15245 "Photo.c"
 					}
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = gee_iterator_get (_tmp11_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					row = (BackingPhotoRow*) _tmp12_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = ret;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = row;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->filepath;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = g_file_new_for_path (_tmp15_);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp17_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 15254 "Photo.c"
+#line 15269 "Photo.c"
 				}
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15258 "Photo.c"
+#line 15273 "Photo.c"
 			}
 		}
-		__finally316:
+		__finally317:
 		{
 			PhotoRow* _tmp18_ = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15268 "Photo.c"
+#line 15283 "Photo.c"
 		}
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (ret);
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 15280 "Photo.c"
+#line 15295 "Photo.c"
 		}
 	}
-#line 1951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15287 "Photo.c"
+#line 15302 "Photo.c"
 }
 
 
@@ -15295,77 +15310,77 @@ GFile* photo_get_source_file (Photo* self) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15313 "Photo.c"
+#line 15328 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15322 "Photo.c"
+#line 15337 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15329 "Photo.c"
+#line 15344 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			PhotoFileFormat _tmp2_ = 0;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->file_format;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15339 "Photo.c"
+#line 15354 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15346 "Photo.c"
+#line 15361 "Photo.c"
 			}
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15350 "Photo.c"
+#line 15365 "Photo.c"
 		}
-		__finally317:
+		__finally318:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15359 "Photo.c"
+#line 15374 "Photo.c"
 		}
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15367 "Photo.c"
+#line 15382 "Photo.c"
 	}
 }
 
@@ -15376,88 +15391,88 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	PhotoFileFormat _tmp0_ = 0;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_file_format (self);
-#line 1965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 	file_format = _tmp0_;
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 15390 "Photo.c"
+#line 15405 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_format_get_system_default_format ();
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		file_format = _tmp3_;
-#line 15396 "Photo.c"
+#line 15411 "Photo.c"
 	}
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = file_format;
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15402 "Photo.c"
+#line 15417 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_master_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15411 "Photo.c"
+#line 15426 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15418 "Photo.c"
+#line 15433 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileFormat _tmp3_ = 0;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15431 "Photo.c"
+#line 15446 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15438 "Photo.c"
+#line 15453 "Photo.c"
 			}
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15442 "Photo.c"
+#line 15457 "Photo.c"
 		}
-		__finally318:
+		__finally319:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15451 "Photo.c"
+#line 15466 "Photo.c"
 		}
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15459 "Photo.c"
+#line 15474 "Photo.c"
 	}
 }
 
@@ -15466,108 +15481,108 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 	Photo * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 1978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15470 "Photo.c"
+#line 15485 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15477 "Photo.c"
+#line 15492 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15487 "Photo.c"
+#line 15502 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15494 "Photo.c"
+#line 15509 "Photo.c"
 			}
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15498 "Photo.c"
+#line 15513 "Photo.c"
 		}
-		__finally319:
+		__finally320:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15507 "Photo.c"
+#line 15522 "Photo.c"
 		}
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15515 "Photo.c"
+#line 15530 "Photo.c"
 	}
 }
 
 
 void photo_get_photo_id (Photo* self, PhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 1984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15524 "Photo.c"
+#line 15539 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15531 "Photo.c"
+#line 15546 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			PhotoID _tmp2_ = {0};
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->photo_id;
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15541 "Photo.c"
+#line 15556 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15548 "Photo.c"
+#line 15563 "Photo.c"
 			}
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15552 "Photo.c"
+#line 15567 "Photo.c"
 		}
-		__finally320:
+		__finally321:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15561 "Photo.c"
+#line 15576 "Photo.c"
 		}
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15569 "Photo.c"
+#line 15584 "Photo.c"
 	}
 }
 
@@ -15576,17 +15591,17 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
 	Photo * self;
 	PhotoRow* _tmp0_ = NULL;
 	EventID _tmp1_ = {0};
-#line 1991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp1_;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 15588 "Photo.c"
+#line 15603 "Photo.c"
 }
 
 
@@ -15595,127 +15610,127 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	PhotoRow* _tmp0_ = NULL;
 	EventID _tmp1_ = {0};
 	gint64 _tmp2_ = 0LL;
-#line 1996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0LL);
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15609 "Photo.c"
+#line 15624 "Photo.c"
 }
 
 
 static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15618 "Photo.c"
+#line 15633 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15625 "Photo.c"
+#line 15640 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15635 "Photo.c"
+#line 15650 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15642 "Photo.c"
+#line 15657 "Photo.c"
 			}
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15646 "Photo.c"
+#line 15661 "Photo.c"
 		}
-		__finally321:
+		__finally322:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15655 "Photo.c"
+#line 15670 "Photo.c"
 		}
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15663 "Photo.c"
+#line 15678 "Photo.c"
 	}
 }
 
 
 void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15672 "Photo.c"
+#line 15687 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15679 "Photo.c"
+#line 15694 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoID _tmp2_ = {0};
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable_id;
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15689 "Photo.c"
+#line 15704 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15696 "Photo.c"
+#line 15711 "Photo.c"
 			}
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15700 "Photo.c"
+#line 15715 "Photo.c"
 		}
-		__finally322:
+		__finally323:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15709 "Photo.c"
+#line 15724 "Photo.c"
 		}
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15717 "Photo.c"
+#line 15732 "Photo.c"
 	}
 }
 
@@ -15724,57 +15739,57 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15728 "Photo.c"
+#line 15743 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15735 "Photo.c"
+#line 15750 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15748 "Photo.c"
+#line 15763 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15755 "Photo.c"
+#line 15770 "Photo.c"
 			}
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15759 "Photo.c"
+#line 15774 "Photo.c"
 		}
-		__finally323:
+		__finally324:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15768 "Photo.c"
+#line 15783 "Photo.c"
 		}
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 15776 "Photo.c"
+#line 15791 "Photo.c"
 	}
 }
 
@@ -15782,54 +15797,54 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 guint64 photo_get_flags (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15786 "Photo.c"
+#line 15801 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15793 "Photo.c"
+#line 15808 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15803 "Photo.c"
+#line 15818 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15810 "Photo.c"
+#line 15825 "Photo.c"
 			}
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15814 "Photo.c"
+#line 15829 "Photo.c"
 		}
-		__finally324:
+		__finally325:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15823 "Photo.c"
+#line 15838 "Photo.c"
 		}
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 15831 "Photo.c"
+#line 15846 "Photo.c"
 	}
 }
 
@@ -15839,41 +15854,41 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 2027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 2027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration = _tmp0_;
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = additional_alteration;
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 15853 "Photo.c"
+#line 15868 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = additional_alteration;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (alteration);
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration = _tmp4_;
-#line 15867 "Photo.c"
+#line 15882 "Photo.c"
 	}
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (alteration);
-#line 15875 "Photo.c"
+#line 15890 "Photo.c"
 }
 
 
@@ -15883,18 +15898,18 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	gboolean _tmp10_ = FALSE;
 	guint64 _tmp12_ = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15889 "Photo.c"
+#line 15904 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15896 "Photo.c"
+#line 15911 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -15902,135 +15917,135 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			guint64 _tmp4_ = 0ULL;
 			gboolean _tmp5_ = FALSE;
 			gboolean _tmp6_ = FALSE;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp3_);
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = flags;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_);
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp5_;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = committed;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15922 "Photo.c"
+#line 15937 "Photo.c"
 				PhotoRow* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = flags;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 15931 "Photo.c"
+#line 15946 "Photo.c"
 			}
 		}
-		__finally325:
+		__finally326:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15941 "Photo.c"
+#line 15956 "Photo.c"
 		}
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 15951 "Photo.c"
+#line 15966 "Photo.c"
 		}
 	}
-#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = committed;
-#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 15958 "Photo.c"
+#line 15973 "Photo.c"
 		Alteration* _tmp11_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = additional_alteration;
-#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp11_);
-#line 15964 "Photo.c"
+#line 15979 "Photo.c"
 	}
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = flags;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp12_;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15972 "Photo.c"
+#line 15987 "Photo.c"
 }
 
 
 gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 15981 "Photo.c"
+#line 15996 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15988 "Photo.c"
+#line 16003 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp4_;
-#line 16004 "Photo.c"
+#line 16019 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16011 "Photo.c"
+#line 16026 "Photo.c"
 			}
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16015 "Photo.c"
+#line 16030 "Photo.c"
 		}
-		__finally326:
+		__finally327:
 		{
 			PhotoRow* _tmp6_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16024 "Photo.c"
+#line 16039 "Photo.c"
 		}
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16032 "Photo.c"
+#line 16047 "Photo.c"
 	}
 }
 
@@ -16041,22 +16056,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2055 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16051 "Photo.c"
+#line 16066 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16058 "Photo.c"
+#line 16073 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16065,99 +16080,99 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16085 "Photo.c"
+#line 16100 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16110 "Photo.c"
+#line 16125 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16119 "Photo.c"
+#line 16134 "Photo.c"
 				}
 			}
 		}
-		__finally327:
+		__finally328:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16130 "Photo.c"
+#line 16145 "Photo.c"
 		}
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16140 "Photo.c"
+#line 16155 "Photo.c"
 		}
 	}
-#line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16147 "Photo.c"
+#line 16162 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16153 "Photo.c"
+#line 16168 "Photo.c"
 	}
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16159 "Photo.c"
+#line 16174 "Photo.c"
 }
 
 
@@ -16167,22 +16182,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2074 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2076 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16177 "Photo.c"
+#line 16192 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16184 "Photo.c"
+#line 16199 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16191,99 +16206,99 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16211 "Photo.c"
+#line 16226 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16236 "Photo.c"
+#line 16251 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16245 "Photo.c"
+#line 16260 "Photo.c"
 				}
 			}
 		}
-		__finally328:
+		__finally329:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16256 "Photo.c"
+#line 16271 "Photo.c"
 		}
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16266 "Photo.c"
+#line 16281 "Photo.c"
 		}
 	}
-#line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16273 "Photo.c"
+#line 16288 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16279 "Photo.c"
+#line 16294 "Photo.c"
 	}
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16285 "Photo.c"
+#line 16300 "Photo.c"
 }
 
 
@@ -16293,22 +16308,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2093 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2095 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16303 "Photo.c"
+#line 16318 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16310 "Photo.c"
+#line 16325 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16317,99 +16332,99 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = add;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = remove;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = (_tmp2_ | _tmp3_) & (~_tmp4_);
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16337 "Photo.c"
+#line 16352 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16362 "Photo.c"
+#line 16377 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16371 "Photo.c"
+#line 16386 "Photo.c"
 				}
 			}
 		}
-		__finally329:
+		__finally330:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16382 "Photo.c"
+#line 16397 "Photo.c"
 		}
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16392 "Photo.c"
+#line 16407 "Photo.c"
 		}
 	}
-#line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16399 "Photo.c"
+#line 16414 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16405 "Photo.c"
+#line 16420 "Photo.c"
 	}
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16411 "Photo.c"
+#line 16426 "Photo.c"
 }
 
 
@@ -16417,34 +16432,34 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_add_alteration == NULL) || IS_ALTERATION (additional_add_alteration));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((remove == NULL) || GEE_IS_COLLECTION (remove));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_remove_alteration == NULL) || IS_ALTERATION (additional_remove_alteration));
-#line 2114 "/home/jens/Source/shotwell/src/Photo.vala"
-	database_table_begin_transaction ();
 #line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
+	database_table_begin_transaction ();
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = add;
-#line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 16433 "Photo.c"
+#line 16448 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = add;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp2_;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16446 "Photo.c"
+#line 16461 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				Photo* photo = NULL;
@@ -16453,57 +16468,57 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
 				Alteration* _tmp9_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _photo_it;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16463 "Photo.c"
+#line 16478 "Photo.c"
 				}
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp6_;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = add_mask;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = additional_add_alteration;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16481 "Photo.c"
+#line 16496 "Photo.c"
 			}
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16485 "Photo.c"
+#line 16500 "Photo.c"
 		}
 	}
-#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = remove;
-#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != NULL) {
-#line 16492 "Photo.c"
+#line 16507 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp11_ = NULL;
 			GeeIterator* _tmp12_ = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = remove;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp12_;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16505 "Photo.c"
+#line 16520 "Photo.c"
 				GeeIterator* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				Photo* photo = NULL;
@@ -16512,58 +16527,58 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
 				Alteration* _tmp19_ = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _photo_it;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_next (_tmp13_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp14_) {
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16522 "Photo.c"
+#line 16537 "Photo.c"
 				}
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = gee_iterator_get (_tmp15_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp16_;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = remove_mask;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = additional_remove_alteration;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16540 "Photo.c"
+#line 16555 "Photo.c"
 			}
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16544 "Photo.c"
+#line 16559 "Photo.c"
 		}
 	}
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16557 "Photo.c"
+#line 16572 "Photo.c"
 		} else {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16565 "Photo.c"
+#line 16580 "Photo.c"
 		}
 	}
 }
@@ -16575,22 +16590,22 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp16_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2130 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16585 "Photo.c"
+#line 16600 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16592 "Photo.c"
+#line 16607 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16598,151 +16613,151 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp4_ = NULL;
 			guint64 _tmp5_ = 0ULL;
 			guint64 _tmp6_ = 0ULL;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp2_ ^ _tmp3_;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->flags;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = flags;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_ != _tmp6_) {
-#line 16616 "Photo.c"
+#line 16631 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
 				guint64 _tmp10_ = 0ULL;
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = flags;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_);
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16641 "Photo.c"
+#line 16656 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					guint64 _tmp14_ = 0ULL;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = flags;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16650 "Photo.c"
+#line 16665 "Photo.c"
 				}
 			}
 		}
-		__finally330:
+		__finally331:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16661 "Photo.c"
+#line 16676 "Photo.c"
 		}
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16671 "Photo.c"
+#line 16686 "Photo.c"
 		}
 	}
-#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
-#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 16678 "Photo.c"
+#line 16693 "Photo.c"
 		Alteration* _tmp17_ = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = additional_alteration;
-#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp17_);
-#line 16684 "Photo.c"
+#line 16699 "Photo.c"
 	}
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16690 "Photo.c"
+#line 16705 "Photo.c"
 }
 
 
 gboolean photo_is_master_metadata_dirty (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16699 "Photo.c"
+#line 16714 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16706 "Photo.c"
+#line 16721 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16716 "Photo.c"
+#line 16731 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16723 "Photo.c"
+#line 16738 "Photo.c"
 			}
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16727 "Photo.c"
+#line 16742 "Photo.c"
 		}
-		__finally331:
+		__finally332:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16736 "Photo.c"
+#line 16751 "Photo.c"
 		}
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16744 "Photo.c"
+#line 16759 "Photo.c"
 	}
 }
 
@@ -16751,110 +16766,110 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	gboolean committed = FALSE;
 	gboolean _tmp11_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16757 "Photo.c"
+#line 16772 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16764 "Photo.c"
+#line 16779 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dirty;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 16777 "Photo.c"
+#line 16792 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoID _tmp6_ = {0};
 				gboolean _tmp7_ = FALSE;
 				PhotoRow* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp6_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = dirty;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16798 "Photo.c"
-					goto __finally332;
+#line 16813 "Photo.c"
+					goto __finally333;
 				}
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = dirty;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->metadata_dirty = _tmp9_;
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = TRUE;
-#line 16809 "Photo.c"
+#line 16824 "Photo.c"
 			}
 		}
-		__finally332:
+		__finally333:
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16819 "Photo.c"
+#line 16834 "Photo.c"
 		}
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16829 "Photo.c"
+#line 16844 "Photo.c"
 			} else {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16837 "Photo.c"
+#line 16852 "Photo.c"
 			}
 		}
 	}
-#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = committed;
-#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16845 "Photo.c"
+#line 16860 "Photo.c"
 		Alteration* _tmp12_ = NULL;
 		Alteration* _tmp13_ = NULL;
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = alteration_new ("metadata", "master-dirty");
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp13_);
-#line 16856 "Photo.c"
+#line 16871 "Photo.c"
 	}
 }
 
@@ -16863,54 +16878,54 @@ static Rating photo_real_get_rating (MediaSource* base) {
 	Photo * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16867 "Photo.c"
+#line 16882 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16874 "Photo.c"
+#line 16889 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16884 "Photo.c"
+#line 16899 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16891 "Photo.c"
+#line 16906 "Photo.c"
 			}
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16895 "Photo.c"
+#line 16910 "Photo.c"
 		}
-		__finally333:
+		__finally334:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16904 "Photo.c"
+#line 16919 "Photo.c"
 		}
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 16912 "Photo.c"
+#line 16927 "Photo.c"
 	}
 }
 
@@ -16920,122 +16935,122 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	gboolean committed = FALSE;
 	gboolean _tmp16_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16926 "Photo.c"
+#line 16941 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16933 "Photo.c"
+#line 16948 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			PhotoRow* _tmp3_ = NULL;
 			Rating _tmp4_ = 0;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp4_) {
-#line 16947 "Photo.c"
+#line 16962 "Photo.c"
 				Rating _tmp5_ = 0;
 				gboolean _tmp6_ = FALSE;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = rating_is_valid (_tmp5_);
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 16956 "Photo.c"
+#line 16971 "Photo.c"
 			} else {
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 16960 "Photo.c"
+#line 16975 "Photo.c"
 			}
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 16964 "Photo.c"
+#line 16979 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
 				Rating _tmp10_ = 0;
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = rating;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_);
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16989 "Photo.c"
+#line 17004 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					Rating _tmp14_ = 0;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = rating;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 16998 "Photo.c"
+#line 17013 "Photo.c"
 				}
 			}
 		}
-		__finally334:
+		__finally335:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17009 "Photo.c"
+#line 17024 "Photo.c"
 		}
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17019 "Photo.c"
+#line 17034 "Photo.c"
 		}
 	}
-#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
-#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 17026 "Photo.c"
+#line 17041 "Photo.c"
 		Alteration* _tmp17_ = NULL;
 		Alteration* _tmp18_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = alteration_new ("metadata", "rating");
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp18_);
-#line 17037 "Photo.c"
+#line 17052 "Photo.c"
 	}
 }
 
@@ -17043,48 +17058,48 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 static void photo_real_increase_rating (MediaSource* base) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17047 "Photo.c"
+#line 17062 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17054 "Photo.c"
+#line 17069 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17067 "Photo.c"
+#line 17082 "Photo.c"
 		}
-		__finally335:
+		__finally336:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17076 "Photo.c"
+#line 17091 "Photo.c"
 		}
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17086 "Photo.c"
+#line 17101 "Photo.c"
 		}
 	}
 }
@@ -17093,48 +17108,48 @@ static void photo_real_increase_rating (MediaSource* base) {
 static void photo_real_decrease_rating (MediaSource* base) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17097 "Photo.c"
+#line 17112 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17104 "Photo.c"
+#line 17119 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17117 "Photo.c"
+#line 17132 "Photo.c"
 		}
-		__finally336:
+		__finally337:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17126 "Photo.c"
+#line 17141 "Photo.c"
 		}
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17136 "Photo.c"
+#line 17151 "Photo.c"
 		}
 	}
 }
@@ -17143,130 +17158,130 @@ static void photo_real_decrease_rating (MediaSource* base) {
 static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17149 "Photo.c"
+#line 17164 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
 		PhotoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp2_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = backlinks;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17171 "Photo.c"
-				goto __catch337_database_error;
+#line 17186 "Photo.c"
+				goto __catch338_database_error;
 			}
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17180 "Photo.c"
+#line 17195 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17188 "Photo.c"
+#line 17203 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = backlinks;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 17203 "Photo.c"
+#line 17218 "Photo.c"
 			}
-			__finally338:
+			__finally339:
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17212 "Photo.c"
+#line 17227 "Photo.c"
 			}
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17218 "Photo.c"
-					goto __catch337_database_error;
+#line 17233 "Photo.c"
+					goto __catch338_database_error;
 				}
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 17227 "Photo.c"
+#line 17242 "Photo.c"
 			}
 		}
 	}
-	goto __finally337;
-	__catch337_database_error:
+	goto __finally338;
+	__catch338_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = err;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->message;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2211: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2213: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp10_);
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17257 "Photo.c"
+#line 17272 "Photo.c"
 	}
-	__finally337:
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally338:
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17268 "Photo.c"
+#line 17283 "Photo.c"
 	}
 }
 
@@ -17275,18 +17290,18 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Photo * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17281 "Photo.c"
+#line 17296 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17288 "Photo.c"
+#line 17303 "Photo.c"
 		{
 			gboolean committed = FALSE;
 			PhotoTable* _tmp1_ = NULL;
@@ -17297,70 +17312,70 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *event_id;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
-			committed = _tmp7_;
 #line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+			committed = _tmp7_;
+#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = committed;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 17321 "Photo.c"
+#line 17336 "Photo.c"
 				PhotoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = *event_id;
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17330 "Photo.c"
+#line 17345 "Photo.c"
 			}
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17334 "Photo.c"
+#line 17349 "Photo.c"
 			{
 				PhotoRow* _tmp11_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17341 "Photo.c"
+#line 17356 "Photo.c"
 			}
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17345 "Photo.c"
+#line 17360 "Photo.c"
 		}
-		__finally339:
+		__finally340:
 		{
 			PhotoRow* _tmp12_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17354 "Photo.c"
+#line 17369 "Photo.c"
 		}
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 17362 "Photo.c"
+#line 17377 "Photo.c"
 	}
 }
 
@@ -17380,13 +17395,13 @@ static gchar* photo_real_to_string (DataObject* base) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
-#line 2230 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_is_master_baseline (self);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17388 "Photo.c"
+#line 17403 "Photo.c"
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17394,74 +17409,74 @@ static gchar* photo_real_to_string (DataObject* base) {
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_actual_file (self);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_strconcat (" (", _tmp5_, NULL);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_strconcat (_tmp7_, ")", NULL);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp8_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp7_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17420 "Photo.c"
+#line 17435 "Photo.c"
 	} else {
 		gchar* _tmp9_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_strdup ("");
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17429 "Photo.c"
+#line 17444 "Photo.c"
 	}
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.id;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_get_master_reader (self);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp17_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp15_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp13_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17463 "Photo.c"
+#line 17478 "Photo.c"
 }
 
 
@@ -17474,21 +17489,21 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	Photo* _tmp2_ = NULL;
 	DataSource* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 2235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2235 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
 #line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
+#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL);
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 2238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 2238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17490 "Photo.c"
+#line 17505 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
@@ -17496,66 +17511,66 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		PhotoID _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp3_);
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id = _tmp3_;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (_tmp4_, &_tmp5_);
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
-		other_photo_id = _tmp5_;
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+		other_photo_id = _tmp5_;
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17512 "Photo.c"
+#line 17527 "Photo.c"
 			PhotoID _tmp8_ = {0};
 			gint64 _tmp9_ = 0LL;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_id;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_.id;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17521 "Photo.c"
+#line 17536 "Photo.c"
 		} else {
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17525 "Photo.c"
+#line 17540 "Photo.c"
 		}
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17529 "Photo.c"
+#line 17544 "Photo.c"
 			PhotoID _tmp10_ = {0};
 			gint64 _tmp11_ = 0LL;
 			PhotoID _tmp12_ = {0};
 			gint64 _tmp13_ = 0LL;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_.id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = other_photo_id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_.id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17544 "Photo.c"
+#line 17559 "Photo.c"
 		}
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), _tmp14_);
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp15_;
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17557 "Photo.c"
+#line 17572 "Photo.c"
 }
 
 
@@ -17575,196 +17590,196 @@ static void photo_file_exif_updated (Photo* self) {
 	gboolean success = FALSE;
 	gboolean _tmp37_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
-	file = _tmp0_;
 #line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
+	file = _tmp0_;
+#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17585 "Photo.c"
+#line 17600 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFileInfo* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp2_;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17596 "Photo.c"
-			goto __catch340_g_error;
+#line 17611 "Photo.c"
+			goto __catch341_g_error;
 		}
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp3_;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17609 "Photo.c"
+#line 17624 "Photo.c"
 	}
-	goto __finally340;
-	__catch340_g_error:
+	goto __finally341;
+	__catch341_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err->message;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_error ("Photo.vala:2259: Unable to read file information for %s: %s", _tmp5_, _tmp6_);
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_error ("Photo.vala:2261: Unable to read file information for %s: %s", _tmp5_, _tmp6_);
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17634 "Photo.c"
+#line 17649 "Photo.c"
 	}
-	__finally340:
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally341:
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17649 "Photo.c"
+#line 17664 "Photo.c"
 	}
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp7_, &_tmp8_);
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp8_;
-#line 2265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
-#line 2265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp9_;
-#line 17661 "Photo.c"
+#line 17676 "Photo.c"
 	{
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17667 "Photo.c"
-			goto __catch341_g_error;
+#line 17682 "Photo.c"
+			goto __catch342_g_error;
 		}
 	}
-	goto __finally341;
-	__catch341_g_error:
+	goto __finally342;
+	__catch342_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = g_file_get_path (file);
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = err;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_->message;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2269: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_);
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2271: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_);
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp11_);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17697 "Photo.c"
+#line 17712 "Photo.c"
 	}
-	__finally341:
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally342:
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17714 "Photo.c"
+#line 17729 "Photo.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp14_;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = detected;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ == NULL) {
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17726 "Photo.c"
+#line 17741 "Photo.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp17_;
-#line 17733 "Photo.c"
+#line 17748 "Photo.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17737 "Photo.c"
+#line 17752 "Photo.c"
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:2274: file_exif_updated: %s no longer an image", _tmp19_);
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp19_);
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
-		_detected_photo_information_unref0 (detected);
+		g_critical ("Photo.vala:2276: file_exif_updated: %s no longer an image", _tmp19_);
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp19_);
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+		_detected_photo_information_unref0 (detected);
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17758 "Photo.c"
+#line 17773 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp20_ = NULL;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = self->row;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17766 "Photo.c"
+#line 17781 "Photo.c"
 		{
 			PhotoTable* _tmp21_ = NULL;
 			PhotoTable* _tmp22_ = NULL;
@@ -17781,96 +17796,96 @@ static void photo_file_exif_updated (Photo* self) {
 			const gchar* _tmp33_ = NULL;
 			PhotoRow* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_table_get_instance ();
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _tmp21_;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp23_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = info;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = g_file_info_get_size (_tmp24_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = timestamp;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_.tv_sec;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_->md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = _tmp30_->exif_md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tmp32_->thumbnail_md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = self->row;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			success = _tmp35_;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17817 "Photo.c"
+#line 17832 "Photo.c"
 		}
-		__finally342:
+		__finally343:
 		{
 			PhotoRow* _tmp36_ = NULL;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = self->row;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17826 "Photo.c"
+#line 17841 "Photo.c"
 		}
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17844 "Photo.c"
+#line 17859 "Photo.c"
 		}
 	}
-#line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = success;
-#line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_) {
-#line 17851 "Photo.c"
+#line 17866 "Photo.c"
 		Alteration* _tmp38_ = NULL;
 		Alteration* _tmp39_ = NULL;
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5");
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp39_);
-#line 17862 "Photo.c"
+#line 17877 "Photo.c"
 	}
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 17872 "Photo.c"
+#line 17887 "Photo.c"
 }
 
 
@@ -17878,54 +17893,54 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17882 "Photo.c"
+#line 17897 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17889 "Photo.c"
+#line 17904 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17899 "Photo.c"
+#line 17914 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17906 "Photo.c"
+#line 17921 "Photo.c"
 			}
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17910 "Photo.c"
+#line 17925 "Photo.c"
 		}
-		__finally343:
+		__finally344:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17919 "Photo.c"
+#line 17934 "Photo.c"
 		}
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17927 "Photo.c"
+#line 17942 "Photo.c"
 	}
 }
 
@@ -17934,57 +17949,57 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17938 "Photo.c"
+#line 17953 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17945 "Photo.c"
+#line 17960 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
 			gint64 _tmp3_ = 0LL;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->filesize;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp3_;
-#line 17958 "Photo.c"
+#line 17973 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17965 "Photo.c"
+#line 17980 "Photo.c"
 			}
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17969 "Photo.c"
+#line 17984 "Photo.c"
 		}
-		__finally344:
+		__finally345:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17978 "Photo.c"
+#line 17993 "Photo.c"
 		}
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17986 "Photo.c"
+#line 18001 "Photo.c"
 	}
 }
 
@@ -17992,54 +18007,54 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 guint64 photo_get_editable_filesize (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 17996 "Photo.c"
+#line 18011 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18003 "Photo.c"
+#line 18018 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->editable;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18013 "Photo.c"
+#line 18028 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18020 "Photo.c"
+#line 18035 "Photo.c"
 			}
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18024 "Photo.c"
+#line 18039 "Photo.c"
 		}
-		__finally345:
+		__finally346:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18033 "Photo.c"
+#line 18048 "Photo.c"
 		}
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 18041 "Photo.c"
+#line 18056 "Photo.c"
 	}
 }
 
@@ -18048,15 +18063,15 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
 	Photo * self;
 	time_t result = 0;
 	time_t _tmp0_ = 0;
-#line 2309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->cached_exposure_time;
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18058 "Photo.c"
+#line 18073 "Photo.c"
 }
 
 
@@ -18064,54 +18079,54 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18068 "Photo.c"
+#line 18083 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18075 "Photo.c"
+#line 18090 "Photo.c"
 		{
 			const gchar* _tmp1_ = NULL;
 			gchar* _tmp2_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->file_title;
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = g_strdup (_tmp1_);
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18085 "Photo.c"
+#line 18100 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18092 "Photo.c"
+#line 18107 "Photo.c"
 			}
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18096 "Photo.c"
+#line 18111 "Photo.c"
 		}
-		__finally346:
+		__finally347:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18105 "Photo.c"
+#line 18120 "Photo.c"
 		}
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18113 "Photo.c"
+#line 18128 "Photo.c"
 	}
 }
 
@@ -18120,57 +18135,57 @@ static gchar* photo_real_get_title (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18124 "Photo.c"
+#line 18139 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18131 "Photo.c"
+#line 18146 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->title;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18144 "Photo.c"
+#line 18159 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18151 "Photo.c"
+#line 18166 "Photo.c"
 			}
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18155 "Photo.c"
+#line 18170 "Photo.c"
 		}
-		__finally347:
+		__finally348:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18164 "Photo.c"
+#line 18179 "Photo.c"
 		}
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18172 "Photo.c"
+#line 18187 "Photo.c"
 	}
 }
 
@@ -18179,57 +18194,57 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18183 "Photo.c"
+#line 18198 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18190 "Photo.c"
+#line 18205 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18203 "Photo.c"
+#line 18218 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18210 "Photo.c"
+#line 18225 "Photo.c"
 			}
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18214 "Photo.c"
+#line 18229 "Photo.c"
 		}
-		__finally348:
+		__finally349:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18223 "Photo.c"
+#line 18238 "Photo.c"
 		}
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18231 "Photo.c"
+#line 18246 "Photo.c"
 	}
 }
 
@@ -18242,24 +18257,24 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	gboolean committed = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = title;
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_title = _tmp1_;
 #line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_title = _tmp1_;
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18254 "Photo.c"
+#line 18269 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18261 "Photo.c"
+#line 18276 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18271,108 +18286,108 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			const gchar* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_title;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->title;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18281 "Photo.c"
+#line 18296 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18288 "Photo.c"
+#line 18303 "Photo.c"
 				}
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_title);
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18294 "Photo.c"
+#line 18309 "Photo.c"
 			}
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_title;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_);
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18316 "Photo.c"
+#line 18331 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_title;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->title);
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->title = _tmp16_;
-#line 18330 "Photo.c"
+#line 18345 "Photo.c"
 			}
 		}
-		__finally349:
+		__finally350:
 		{
 			PhotoRow* _tmp17_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18340 "Photo.c"
+#line 18355 "Photo.c"
 		}
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_title);
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18352 "Photo.c"
+#line 18367 "Photo.c"
 		}
 	}
-#line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18359 "Photo.c"
+#line 18374 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "name");
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18370 "Photo.c"
+#line 18385 "Photo.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18374 "Photo.c"
+#line 18389 "Photo.c"
 }
 
 
@@ -18385,24 +18400,24 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	gboolean committed = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = comment;
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_comment (_tmp0_);
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_comment = _tmp1_;
 #line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_comment = _tmp1_;
+#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18397 "Photo.c"
+#line 18412 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18404 "Photo.c"
+#line 18419 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18414,121 +18429,121 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			const gchar* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_comment;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->comment;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 18426 "Photo.c"
+#line 18441 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18433 "Photo.c"
+#line 18448 "Photo.c"
 				}
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_comment);
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 18439 "Photo.c"
+#line 18454 "Photo.c"
 			}
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_comment;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_);
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18461 "Photo.c"
+#line 18476 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_comment;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->comment);
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->comment = _tmp16_;
-#line 18475 "Photo.c"
+#line 18490 "Photo.c"
 			}
 		}
-		__finally350:
+		__finally351:
 		{
 			PhotoRow* _tmp17_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18485 "Photo.c"
+#line 18500 "Photo.c"
 		}
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_comment);
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 18497 "Photo.c"
+#line 18512 "Photo.c"
 		}
 	}
-#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18504 "Photo.c"
+#line 18519 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "comment");
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18515 "Photo.c"
+#line 18530 "Photo.c"
 	}
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_comment);
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18523 "Photo.c"
+#line 18538 "Photo.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 18530 "Photo.c"
+#line 18545 "Photo.c"
 }
 
 
@@ -18536,20 +18551,20 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 	GError* dberr = NULL;
 	GError* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (import_id != NULL);
-#line 2368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	dberr = NULL;
-#line 18544 "Photo.c"
+#line 18559 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18551 "Photo.c"
+#line 18566 "Photo.c"
 		{
 			{
 				PhotoTable* _tmp1_ = NULL;
@@ -18559,158 +18574,158 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				ImportID _tmp5_ = {0};
 				PhotoRow* _tmp7_ = NULL;
 				ImportID _tmp8_ = {0};
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = photo_table_get_instance ();
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp2_ = _tmp1_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->photo_id;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = *import_id;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_import_id (_tmp2_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp2_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18579 "Photo.c"
-						goto __catch352_database_error;
+#line 18594 "Photo.c"
+						goto __catch353_database_error;
 					}
 					{
 						PhotoRow* _tmp6_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18588 "Photo.c"
+#line 18603 "Photo.c"
 					}
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 18598 "Photo.c"
+#line 18613 "Photo.c"
 				}
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = *import_id;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->import_id = _tmp8_;
-#line 18606 "Photo.c"
+#line 18621 "Photo.c"
 			}
-			goto __finally352;
-			__catch352_database_error:
+			goto __finally353;
+			__catch353_database_error:
 			{
 				GError* err = NULL;
 				GError* _tmp9_ = NULL;
 				GError* _tmp10_ = NULL;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = err;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _g_error_copy0 (_tmp9_);
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				dberr = _tmp10_;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 18628 "Photo.c"
+#line 18643 "Photo.c"
 			}
-			__finally352:
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally353:
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18633 "Photo.c"
+#line 18648 "Photo.c"
 				{
 					PhotoRow* _tmp11_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18640 "Photo.c"
+#line 18655 "Photo.c"
 				}
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18650 "Photo.c"
+#line 18665 "Photo.c"
 			}
 		}
-		__finally351:
+		__finally352:
 		{
 			PhotoRow* _tmp12_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18660 "Photo.c"
+#line 18675 "Photo.c"
 		}
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (dberr);
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18672 "Photo.c"
+#line 18687 "Photo.c"
 		}
 	}
-#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = dberr;
-#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 18679 "Photo.c"
+#line 18694 "Photo.c"
 		Alteration* _tmp14_ = NULL;
 		Alteration* _tmp15_ = NULL;
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = alteration_new ("metadata", "import-id");
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp15_);
-#line 18690 "Photo.c"
+#line 18705 "Photo.c"
 	} else {
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = dberr;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->message;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2381: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp17_);
-#line 18708 "Photo.c"
+#line 18723 "Photo.c"
 	}
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18712 "Photo.c"
+#line 18727 "Photo.c"
 }
 
 
@@ -18733,155 +18748,155 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	GFile* _tmp16_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18749 "Photo.c"
+#line 18764 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2389: No photo file writer available for %s", _tmp6_);
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = title;
+		g_warning ("Photo.vala:2391: No photo file writer available for %s", _tmp6_);
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = title;
 #line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
+		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
+		_photo_file_adapter_unref0 (source);
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18772 "Photo.c"
+#line 18787 "Photo.c"
 	}
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18788 "Photo.c"
+#line 18803 "Photo.c"
 	}
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = title;
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = source;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18812 "Photo.c"
+#line 18827 "Photo.c"
 	}
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18824 "Photo.c"
+#line 18839 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18836 "Photo.c"
-			goto __finally353;
+#line 18851 "Photo.c"
+			goto __finally354;
 		}
 	}
-	__finally353:
+	__finally354:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
 		GFile* _tmp21_ = NULL;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18855 "Photo.c"
+#line 18870 "Photo.c"
 	}
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18869 "Photo.c"
+#line 18884 "Photo.c"
 	}
-#line 2407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
-#line 2407 "/home/jens/Source/shotwell/src/Photo.vala"
-	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
 #line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
+	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
+#line 2411 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 18883 "Photo.c"
+#line 18898 "Photo.c"
 }
 
 
@@ -18904,155 +18919,155 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	GFile* _tmp16_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18920 "Photo.c"
+#line 18935 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2417: No photo file writer available for %s", _tmp6_);
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = comment;
+		g_warning ("Photo.vala:2419: No photo file writer available for %s", _tmp6_);
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = comment;
 #line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
+		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
+		_photo_file_adapter_unref0 (source);
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18943 "Photo.c"
+#line 18958 "Photo.c"
 	}
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18959 "Photo.c"
+#line 18974 "Photo.c"
 	}
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = comment;
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = source;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18983 "Photo.c"
+#line 18998 "Photo.c"
 	}
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18995 "Photo.c"
+#line 19010 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19007 "Photo.c"
-			goto __finally354;
+#line 19022 "Photo.c"
+			goto __finally355;
 		}
 	}
-	__finally354:
+	__finally355:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
 		GFile* _tmp21_ = NULL;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 19026 "Photo.c"
+#line 19041 "Photo.c"
 	}
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19040 "Photo.c"
+#line 19055 "Photo.c"
 	}
-#line 2435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
-#line 2435 "/home/jens/Source/shotwell/src/Photo.vala"
-	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
 #line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
+	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
+#line 2439 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19054 "Photo.c"
+#line 19069 "Photo.c"
 }
 
 
@@ -19061,16 +19076,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	gboolean committed = FALSE;
 	gboolean _tmp12_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19065 "Photo.c"
+#line 19080 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19072 "Photo.c"
+#line 19087 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -19079,79 +19094,79 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			time_t _tmp5_ = 0;
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = time;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_);
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp6_;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = committed;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_) {
-#line 19101 "Photo.c"
+#line 19116 "Photo.c"
 				PhotoRow* _tmp8_ = NULL;
 				time_t _tmp9_ = 0;
 				time_t _tmp10_ = 0;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = time;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->exposure_time = _tmp9_;
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = time;
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->cached_exposure_time = _tmp10_;
-#line 19115 "Photo.c"
+#line 19130 "Photo.c"
 			}
 		}
-		__finally355:
+		__finally356:
 		{
 			PhotoRow* _tmp11_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19125 "Photo.c"
+#line 19140 "Photo.c"
 		}
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 19135 "Photo.c"
+#line 19150 "Photo.c"
 		}
 	}
-#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = committed;
-#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 19142 "Photo.c"
+#line 19157 "Photo.c"
 		Alteration* _tmp13_ = NULL;
 		Alteration* _tmp14_ = NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = alteration_new ("metadata", "exposure-time");
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp14_);
-#line 19153 "Photo.c"
+#line 19168 "Photo.c"
 	}
 }
 
@@ -19177,161 +19192,161 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	GFile* _tmp18_ = NULL;
 	time_t _tmp24_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19193 "Photo.c"
+#line 19208 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		time_t _tmp7_ = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2459: No photo file writer available for %s", _tmp6_);
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = time;
+		g_warning ("Photo.vala:2461: No photo file writer available for %s", _tmp6_);
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
-		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = time;
 #line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
+		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_);
+#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
+		_photo_file_adapter_unref0 (source);
+#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19216 "Photo.c"
+#line 19231 "Photo.c"
 	}
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19232 "Photo.c"
+#line 19247 "Photo.c"
 	}
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = time;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata_date_time_new (_tmp11_);
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_metadata_date_time_unref0 (_tmp13_);
 #line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+	_metadata_date_time_unref0 (_tmp13_);
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp15_;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19262 "Photo.c"
+#line 19277 "Photo.c"
 	}
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_;
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp18_);
-#line 19274 "Photo.c"
+#line 19289 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp19_ = NULL;
 		PhotoMetadata* _tmp20_ = NULL;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = writer;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = metadata;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19286 "Photo.c"
-			goto __finally356;
+#line 19301 "Photo.c"
+			goto __finally357;
 		}
 	}
-	__finally356:
+	__finally357:
 	{
 		PhotoFileReader* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
 		GFile* _tmp23_ = NULL;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = source;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp23_);
-#line 19305 "Photo.c"
+#line 19320 "Photo.c"
 	}
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19319 "Photo.c"
+#line 19334 "Photo.c"
 	}
-#line 2477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
-#line 2477 "/home/jens/Source/shotwell/src/Photo.vala"
-	dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_);
 #line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
+	dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_);
+#line 2481 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19333 "Photo.c"
+#line 19348 "Photo.c"
 }
 
 
@@ -19358,39 +19373,39 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	gboolean _tmp11_ = FALSE;
 	PhotoException _tmp22_ = 0;
 	gboolean _tmp23_ = FALSE;
-#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
+#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
 	returned_dims = _tmp0_;
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = disallowed_steps;
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 19372 "Photo.c"
+#line 19387 "Photo.c"
 		Orientation ori_tmp = 0;
 		Orientation _tmp3_ = 0;
 		Orientation _tmp4_ = 0;
-#line 2501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_orientation (self);
-#line 2501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
 		ori_tmp = _tmp3_;
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = ori_tmp;
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 		switch (_tmp4_) {
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_TOP:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_TOP:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_BOTTOM:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_BOTTOM:
-#line 19392 "Photo.c"
+#line 19407 "Photo.c"
 			{
 				gint width_tmp = 0;
 				Dimensions _tmp5_ = {0};
@@ -19398,41 +19413,41 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 				Dimensions _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = returned_dims;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_.width;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
-				width_tmp = _tmp6_;
 #line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+				width_tmp = _tmp6_;
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = returned_dims;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_.height;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.width = _tmp8_;
-#line 2513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = width_tmp;
-#line 2513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.height = _tmp9_;
-#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19418 "Photo.c"
+#line 19433 "Photo.c"
 			}
 			default:
 			{
-#line 2518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19424 "Photo.c"
+#line 19439 "Photo.c"
 			}
 		}
 	}
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = disallowed_steps;
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 19434 "Photo.c"
+#line 19449 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
@@ -19446,71 +19461,71 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		gdouble _tmp19_ = 0.0;
 		gdouble _tmp20_ = 0.0;
 		gdouble _tmp21_ = 0.0;
-#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
-		angle = 0.0;
 #line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
+		angle = 0.0;
+#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_straighten (self, &_tmp12_);
-#line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
-		angle = _tmp12_;
 #line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+		angle = _tmp12_;
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = returned_dims;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = returned_dims;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = angle;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_);
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		x_size = _tmp18_;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
-		y_size = _tmp19_;
 #line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+		y_size = _tmp19_;
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = x_size;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.width = (gint) _tmp20_;
-#line 2532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = y_size;
-#line 2532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.height = (gint) _tmp21_;
-#line 19478 "Photo.c"
+#line 19493 "Photo.c"
 	}
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 19486 "Photo.c"
+#line 19501 "Photo.c"
 		Box crop = {0};
 		PhotoException _tmp24_ = 0;
 		Box _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = disallowed_steps;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_);
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp25_;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19499 "Photo.c"
+#line 19514 "Photo.c"
 			Dimensions _tmp27_ = {0};
-#line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp27_);
-#line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			returned_dims = _tmp27_;
-#line 19505 "Photo.c"
+#line 19520 "Photo.c"
 		}
 	}
-#line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = returned_dims;
-#line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 19512 "Photo.c"
+#line 19527 "Photo.c"
 }
 
 
@@ -19521,114 +19536,114 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	KeyValueMap* _tmp2_ = NULL;
 	PixelTransformationBundle* _tmp6_ = NULL;
 	PixelTransformer* _tmp7_ = NULL;
-#line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->adjustments = _tmp0_;
 #line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->adjustments = _tmp0_;
+#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_transformation (self, "adjustments");
-#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp1_;
-#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 19539 "Photo.c"
+#line 19554 "Photo.c"
 		PixelTransformationBundle* _tmp3_ = NULL;
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->adjustments;
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19545 "Photo.c"
+#line 19560 "Photo.c"
 	} else {
 		PixelTransformationBundle* _tmp4_ = NULL;
 		KeyValueMap* _tmp5_ = NULL;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->adjustments;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = map;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19555 "Photo.c"
+#line 19570 "Photo.c"
 	}
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_);
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->transformer = _tmp7_;
-#line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 19567 "Photo.c"
+#line 19582 "Photo.c"
 }
 
 
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 	PixelTransformationBundle* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19576 "Photo.c"
+#line 19591 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19583 "Photo.c"
+#line 19598 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp1_ = NULL;
 			PixelTransformationBundle* _tmp2_ = NULL;
 			PixelTransformationBundle* _tmp3_ = NULL;
-#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->adjustments;
-#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19594 "Photo.c"
+#line 19609 "Photo.c"
 			}
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19602 "Photo.c"
+#line 19617 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19609 "Photo.c"
+#line 19624 "Photo.c"
 			}
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19613 "Photo.c"
+#line 19628 "Photo.c"
 		}
-		__finally357:
+		__finally358:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19622 "Photo.c"
+#line 19637 "Photo.c"
 		}
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19630 "Photo.c"
+#line 19645 "Photo.c"
 	}
 }
 
@@ -19636,63 +19651,63 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 	PixelTransformer* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19640 "Photo.c"
+#line 19655 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19647 "Photo.c"
+#line 19662 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
 			PixelTransformer* _tmp3_ = NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->transformer;
-#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19658 "Photo.c"
+#line 19673 "Photo.c"
 			}
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19666 "Photo.c"
+#line 19681 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19673 "Photo.c"
+#line 19688 "Photo.c"
 			}
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19677 "Photo.c"
+#line 19692 "Photo.c"
 		}
-		__finally358:
+		__finally359:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19686 "Photo.c"
+#line 19701 "Photo.c"
 		}
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19694 "Photo.c"
+#line 19709 "Photo.c"
 	}
 }
 
@@ -19700,15 +19715,15 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 gboolean photo_has_color_adjustments (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "adjustments");
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19710 "Photo.c"
+#line 19725 "Photo.c"
 }
 
 
@@ -19719,25 +19734,25 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	PixelTransformationType _tmp2_ = 0;
 	PixelTransformation* _tmp3_ = NULL;
 	PixelTransformation* _tmp4_ = NULL;
-#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_color_adjustments (self);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = type;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (_tmp1_);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19739 "Photo.c"
+#line 19754 "Photo.c"
 }
 
 
@@ -19750,141 +19765,141 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	gboolean committed = FALSE;
 	gboolean _tmp39_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = new_adjustments;
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 19762 "Photo.c"
+#line 19777 "Photo.c"
 		gboolean _result_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19771 "Photo.c"
+#line 19786 "Photo.c"
 			{
 				gboolean _tmp3_ = FALSE;
-#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = photo_remove_transformation (self, "adjustments");
-#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				_result_ = _tmp3_;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = NULL;
-#line 19786 "Photo.c"
+#line 19801 "Photo.c"
 			}
-			__finally359:
+			__finally360:
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19795 "Photo.c"
+#line 19810 "Photo.c"
 			}
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 19805 "Photo.c"
+#line 19820 "Photo.c"
 			}
 		}
-#line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _result_;
-#line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 19812 "Photo.c"
+#line 19827 "Photo.c"
 			Alteration* _tmp6_ = NULL;
 			Alteration* _tmp7_ = NULL;
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = alteration_new ("image", "color-adjustments");
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (_tmp7_);
-#line 19823 "Photo.c"
+#line 19838 "Photo.c"
 		}
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19827 "Photo.c"
+#line 19842 "Photo.c"
 	}
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp9_;
-#line 19835 "Photo.c"
+#line 19850 "Photo.c"
 	{
 		PhotoRow* _tmp10_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->row;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19842 "Photo.c"
+#line 19857 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 			PixelTransformer* _tmp12_ = NULL;
 			KeyValueMap* _tmp36_ = NULL;
 			gboolean _tmp37_ = FALSE;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->transformer;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_ == NULL) {
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19854 "Photo.c"
+#line 19869 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp13_ = NULL;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->priv->adjustments;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp13_ == NULL;
-#line 19861 "Photo.c"
+#line 19876 "Photo.c"
 			}
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19865 "Photo.c"
+#line 19880 "Photo.c"
 				PixelTransformationBundle* _tmp14_ = NULL;
 				PixelTransformationBundle* _tmp15_ = NULL;
 				PixelTransformationBundle* _tmp16_ = NULL;
 				PixelTransformer* _tmp17_ = NULL;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = new_adjustments;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = pixel_transformation_bundle_copy (_tmp14_);
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp15_;
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_adjustments;
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_);
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp17_;
-#line 19886 "Photo.c"
+#line 19901 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp34_ = NULL;
 				PixelTransformationBundle* _tmp35_ = NULL;
@@ -19895,23 +19910,23 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 					GeeIterable* _tmp20_ = NULL;
 					GeeIterator* _tmp21_ = NULL;
 					GeeIterator* _tmp22_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = new_adjustments;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _tmp19_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = gee_iterable_iterator (_tmp20_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp20_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_transformation_it = _tmp22_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 19913 "Photo.c"
+#line 19928 "Photo.c"
 						GeeIterator* _tmp23_ = NULL;
 						gboolean _tmp24_ = FALSE;
 						PixelTransformation* transformation = NULL;
@@ -19924,108 +19939,108 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						PixelTransformation* _tmp31_ = NULL;
 						PixelTransformation* _tmp32_ = NULL;
 						PixelTransformation* _tmp33_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = _transformation_it;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp24_ = gee_iterator_next (_tmp23_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp24_) {
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 19934 "Photo.c"
+#line 19949 "Photo.c"
 						}
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = gee_iterator_get (_tmp25_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						transformation = (PixelTransformation*) _tmp26_;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = self->priv->transformer;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = self->priv->adjustments;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = transformation;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = pixel_transformation_get_transformation_type (_tmp29_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = _tmp31_;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp33_ = transformation;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (_tmp32_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (transformation);
-#line 19962 "Photo.c"
+#line 19977 "Photo.c"
 					}
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 19966 "Photo.c"
+#line 19981 "Photo.c"
 				}
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = pixel_transformation_bundle_copy (_tmp34_);
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp35_;
-#line 19976 "Photo.c"
+#line 19991 "Photo.c"
 			}
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = photo_set_transformation (self, _tmp36_);
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp37_;
-#line 19984 "Photo.c"
+#line 19999 "Photo.c"
 		}
-		__finally360:
+		__finally361:
 		{
 			PhotoRow* _tmp38_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = self->row;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19993 "Photo.c"
+#line 20008 "Photo.c"
 		}
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20005 "Photo.c"
+#line 20020 "Photo.c"
 		}
 	}
-#line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = committed;
-#line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_) {
-#line 20012 "Photo.c"
+#line 20027 "Photo.c"
 		Alteration* _tmp40_ = NULL;
 		Alteration* _tmp41_ = NULL;
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = alteration_new ("image", "color-adjustments");
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_;
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp41_);
-#line 20023 "Photo.c"
+#line 20038 "Photo.c"
 	}
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20027 "Photo.c"
+#line 20042 "Photo.c"
 }
 
 
@@ -20033,9 +20048,9 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	Photo * self;
 	PhotoMetadata* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20037 "Photo.c"
+#line 20052 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
 		PhotoFileReader* _tmp1_ = NULL;
@@ -20043,67 +20058,67 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		PhotoMetadata* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 		PhotoMetadata* _tmp5_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_get_source_reader (self);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp2_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20059 "Photo.c"
-			goto __catch361_g_error;
+#line 20074 "Photo.c"
+			goto __catch362_g_error;
 		}
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp5_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp0_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20072 "Photo.c"
+#line 20087 "Photo.c"
 	}
-	goto __finally361;
-	__catch361_g_error:
+	goto __finally362;
+	__catch362_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_->message;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2634: Unable to load metadata: %s", _tmp7_);
 #line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2636: Unable to load metadata: %s", _tmp7_);
+#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20096 "Photo.c"
+#line 20111 "Photo.c"
 	}
-	__finally361:
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally362:
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_clear_error (&_inner_error_);
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20105 "Photo.c"
+#line 20120 "Photo.c"
 }
 
 
@@ -20116,39 +20131,39 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp4_ = NULL;
 	PhotoMetadata* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_reader (self);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp2_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp4_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 20138 "Photo.c"
+#line 20153 "Photo.c"
 	}
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20150 "Photo.c"
+#line 20165 "Photo.c"
 }
 
 
@@ -20159,53 +20174,53 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2645 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20171 "Photo.c"
+#line 20186 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_reader_read_metadata (_tmp3_, &_inner_error_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 20192 "Photo.c"
+#line 20207 "Photo.c"
 		}
 	} else {
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 20199 "Photo.c"
+#line 20214 "Photo.c"
 	}
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20207 "Photo.c"
+#line 20222 "Photo.c"
 }
 
 
@@ -20228,180 +20243,180 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	gboolean _tmp12_ = FALSE;
 	PhotoReimportMasterState* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
 #line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
+#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
-	master_reader = _tmp0_;
 #line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+	master_reader = _tmp0_;
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = master_reader;
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20258 "Photo.c"
+#line 20273 "Photo.c"
 		} else {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20262 "Photo.c"
+#line 20277 "Photo.c"
 		}
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20266 "Photo.c"
+#line 20281 "Photo.c"
 	}
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp6_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20282 "Photo.c"
+#line 20297 "Photo.c"
 	}
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp4_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = NULL;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = metadata;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp8_, _tmp9_, &_inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp8_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20306 "Photo.c"
+#line 20321 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp11_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp12_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20326 "Photo.c"
+#line 20341 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20340 "Photo.c"
+#line 20355 "Photo.c"
 		} else {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20344 "Photo.c"
+#line 20359 "Photo.c"
 		}
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20348 "Photo.c"
+#line 20363 "Photo.c"
 	}
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _vala_state;
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp4_);
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (master_reader);
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20364 "Photo.c"
+#line 20379 "Photo.c"
 	} else {
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20368 "Photo.c"
+#line 20383 "Photo.c"
 	}
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20372 "Photo.c"
+#line 20387 "Photo.c"
 }
 
 
 void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) {
 	PhotoReimportMasterState* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_master (self, _tmp0_, &_inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20395 "Photo.c"
+#line 20410 "Photo.c"
 		} else {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20403 "Photo.c"
+#line 20418 "Photo.c"
 		}
 	}
 }
@@ -20427,202 +20442,202 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	gboolean _tmp13_ = FALSE;
 	PhotoReimportEditableState* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
 #line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
+#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_reader = _tmp0_;
-#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = editable_reader;
-#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20453 "Photo.c"
+#line 20468 "Photo.c"
 		} else {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20457 "Photo.c"
+#line 20472 "Photo.c"
 		}
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20461 "Photo.c"
+#line 20476 "Photo.c"
 	}
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_can_write_metadata (_tmp3_);
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp4_) {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20479 "Photo.c"
+#line 20494 "Photo.c"
 		} else {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20483 "Photo.c"
+#line 20498 "Photo.c"
 		}
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20487 "Photo.c"
+#line 20502 "Photo.c"
 	}
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp7_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20503 "Photo.c"
+#line 20518 "Photo.c"
 	}
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp5_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = NULL;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp9_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20527 "Photo.c"
+#line 20542 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp12_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp13_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20547 "Photo.c"
+#line 20562 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp11_) {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20561 "Photo.c"
+#line 20576 "Photo.c"
 		} else {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20565 "Photo.c"
+#line 20580 "Photo.c"
 		}
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20569 "Photo.c"
+#line 20584 "Photo.c"
 	}
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _vala_state;
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (editable_reader);
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20585 "Photo.c"
+#line 20600 "Photo.c"
 	} else {
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20589 "Photo.c"
+#line 20604 "Photo.c"
 	}
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20593 "Photo.c"
+#line 20608 "Photo.c"
 }
 
 
 void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) {
 	PhotoReimportEditableState* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_editable (self, _tmp0_, &_inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20616 "Photo.c"
+#line 20631 "Photo.c"
 		} else {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20624 "Photo.c"
+#line 20639 "Photo.c"
 		}
 	}
 }
@@ -20630,54 +20645,54 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 
 void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 20634 "Photo.c"
+#line 20649 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20641 "Photo.c"
+#line 20656 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Dimensions _tmp2_ = {0};
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->dim;
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20651 "Photo.c"
+#line 20666 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20658 "Photo.c"
+#line 20673 "Photo.c"
 			}
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20662 "Photo.c"
+#line 20677 "Photo.c"
 		}
-		__finally362:
+		__finally363:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20671 "Photo.c"
+#line 20686 "Photo.c"
 		}
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 20679 "Photo.c"
+#line 20694 "Photo.c"
 	}
 }
 
@@ -20685,77 +20700,77 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 gboolean photo_has_transformations (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20689 "Photo.c"
+#line 20704 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20696 "Photo.c"
+#line 20711 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
 			Orientation _tmp3_ = 0;
 			BackingPhotoRow* _tmp4_ = NULL;
 			Orientation _tmp5_ = 0;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->orientation;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->backing_photo_row;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->original_orientation;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != _tmp5_) {
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20715 "Photo.c"
+#line 20730 "Photo.c"
 			} else {
 				PhotoRow* _tmp6_ = NULL;
 				GeeHashMap* _tmp7_ = NULL;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->transformations;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20725 "Photo.c"
+#line 20740 "Photo.c"
 			}
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20729 "Photo.c"
+#line 20744 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20736 "Photo.c"
+#line 20751 "Photo.c"
 			}
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20740 "Photo.c"
+#line 20755 "Photo.c"
 		}
-		__finally363:
+		__finally364:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20749 "Photo.c"
+#line 20764 "Photo.c"
 		}
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20757 "Photo.c"
+#line 20772 "Photo.c"
 	}
 }
 
@@ -20767,152 +20782,152 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	PhotoMetadata* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2718 "/home/jens/Source/shotwell/src/Photo.vala"
-	date_time = NULL;
 #line 2720 "/home/jens/Source/shotwell/src/Photo.vala"
+	date_time = NULL;
+#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2721 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2721 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20781 "Photo.c"
+#line 20796 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 20792 "Photo.c"
+#line 20807 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp4_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20800 "Photo.c"
+#line 20815 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			PhotoRow* _tmp6_ = NULL;
 			GeeHashMap* _tmp7_ = NULL;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->transformations;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20811 "Photo.c"
+#line 20826 "Photo.c"
 				gboolean _tmp8_ = FALSE;
 				PhotoRow* _tmp9_ = NULL;
 				Orientation _tmp10_ = 0;
 				BackingPhotoRow* _tmp11_ = NULL;
 				Orientation _tmp12_ = 0;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->orientation;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->backing_photo_row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->original_orientation;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ != _tmp12_) {
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20829 "Photo.c"
+#line 20844 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
 					MetadataDateTime* _tmp14_ = NULL;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = date_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20837 "Photo.c"
+#line 20852 "Photo.c"
 						PhotoRow* _tmp15_ = NULL;
 						time_t _tmp16_ = 0;
 						MetadataDateTime* _tmp17_ = NULL;
 						time_t _tmp18_ = 0;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = _tmp15_->exposure_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = date_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = _tmp16_ != _tmp18_;
-#line 20852 "Photo.c"
+#line 20867 "Photo.c"
 					} else {
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20856 "Photo.c"
+#line 20871 "Photo.c"
 					}
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20860 "Photo.c"
+#line 20875 "Photo.c"
 				}
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20864 "Photo.c"
+#line 20879 "Photo.c"
 			} else {
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20868 "Photo.c"
+#line 20883 "Photo.c"
 			}
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20872 "Photo.c"
+#line 20887 "Photo.c"
 			{
 				PhotoRow* _tmp19_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20879 "Photo.c"
+#line 20894 "Photo.c"
 			}
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20887 "Photo.c"
+#line 20902 "Photo.c"
 		}
-		__finally364:
+		__finally365:
 		{
 			PhotoRow* _tmp20_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20896 "Photo.c"
+#line 20911 "Photo.c"
 		}
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20908 "Photo.c"
+#line 20923 "Photo.c"
 	}
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 20914 "Photo.c"
+#line 20929 "Photo.c"
 }
 
 
@@ -20926,142 +20941,142 @@ gboolean photo_has_alterations (Photo* self) {
 	PhotoMetadata* _tmp1_ = NULL;
 	MetadataDateTime* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
 	date_time = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Photo.vala"
 	title = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
-	comment = NULL;
 #line 2736 "/home/jens/Source/shotwell/src/Photo.vala"
+	comment = NULL;
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20944 "Photo.c"
+#line 20959 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		PhotoMetadata* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = metadata;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		title = _tmp5_;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = metadata;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 20975 "Photo.c"
+#line 20990 "Photo.c"
 	}
-#line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = date_time;
-#line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 20981 "Photo.c"
+#line 20996 "Photo.c"
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20988 "Photo.c"
+#line 21003 "Photo.c"
 			{
 				BackingPhotoRow* _tmp10_ = NULL;
 				time_t _tmp11_ = 0;
 				PhotoRow* _tmp12_ = NULL;
 				time_t _tmp13_ = 0;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->backing_photo_row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_->timestamp;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->exposure_time;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp11_ != _tmp13_) {
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp11_ != _tmp13_) {
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21006 "Photo.c"
+#line 21021 "Photo.c"
 					{
 						PhotoRow* _tmp14_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21013 "Photo.c"
+#line 21028 "Photo.c"
 					}
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (comment);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (title);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_metadata_date_time_unref0 (date_time);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21025 "Photo.c"
+#line 21040 "Photo.c"
 				}
 			}
-			__finally365:
+			__finally366:
 			{
 				PhotoRow* _tmp15_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21035 "Photo.c"
+#line 21050 "Photo.c"
 			}
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (metadata);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (comment);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (title);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_metadata_date_time_unref0 (date_time);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 21053 "Photo.c"
+#line 21068 "Photo.c"
 			}
 		}
 	}
 	{
 		PhotoRow* _tmp16_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21063 "Photo.c"
+#line 21078 "Photo.c"
 		{
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
@@ -21069,184 +21084,184 @@ gboolean photo_has_alterations (Photo* self) {
 			gboolean _tmp20_ = FALSE;
 			PhotoRow* _tmp21_ = NULL;
 			GeeHashMap* _tmp22_ = NULL;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->row;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _tmp21_->transformations;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_ != NULL) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = TRUE;
-#line 21079 "Photo.c"
+#line 21094 "Photo.c"
 			} else {
 				PhotoRow* _tmp23_ = NULL;
 				Orientation _tmp24_ = 0;
 				BackingPhotoRow* _tmp25_ = NULL;
 				Orientation _tmp26_ = 0;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = self->row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _tmp23_->orientation;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = self->backing_photo_row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _tmp25_->original_orientation;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp24_ != _tmp26_;
-#line 21095 "Photo.c"
+#line 21110 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp20_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = TRUE;
-#line 21101 "Photo.c"
+#line 21116 "Photo.c"
 			} else {
 				gboolean _tmp27_ = FALSE;
 				MetadataDateTime* _tmp28_ = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = date_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_ != NULL) {
-#line 21109 "Photo.c"
+#line 21124 "Photo.c"
 					PhotoRow* _tmp29_ = NULL;
 					time_t _tmp30_ = 0;
 					MetadataDateTime* _tmp31_ = NULL;
 					time_t _tmp32_ = 0;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->row;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = _tmp29_->exposure_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = date_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = metadata_date_time_get_timestamp (_tmp31_);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp30_ != _tmp32_;
-#line 21124 "Photo.c"
+#line 21139 "Photo.c"
 				} else {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = FALSE;
-#line 21128 "Photo.c"
+#line 21143 "Photo.c"
 				}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp27_;
-#line 21132 "Photo.c"
+#line 21147 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = TRUE;
-#line 21138 "Photo.c"
+#line 21153 "Photo.c"
 			} else {
 				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = comment;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp34_);
-#line 21153 "Photo.c"
+#line 21168 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = TRUE;
-#line 21159 "Photo.c"
+#line 21174 "Photo.c"
 			} else {
 				gchar* _tmp36_ = NULL;
 				gchar* _tmp37_ = NULL;
 				const gchar* _tmp38_ = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = title;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp37_);
-#line 21174 "Photo.c"
+#line 21189 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 21178 "Photo.c"
+#line 21193 "Photo.c"
 			{
 				PhotoRow* _tmp39_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21185 "Photo.c"
+#line 21200 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21197 "Photo.c"
+#line 21212 "Photo.c"
 		}
-		__finally366:
+		__finally367:
 		{
 			PhotoRow* _tmp40_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21206 "Photo.c"
+#line 21221 "Photo.c"
 		}
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 21222 "Photo.c"
+#line 21237 "Photo.c"
 	}
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21232 "Photo.c"
+#line 21247 "Photo.c"
 }
 
 
 PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 	PhotoTransformationState* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21241 "Photo.c"
+#line 21256 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21248 "Photo.c"
+#line 21263 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -21257,112 +21272,112 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			PhotoRow* _tmp11_ = NULL;
 			GeeHashMap* _tmp12_ = NULL;
 			PhotoPhotoTransformationStateImpl* _tmp13_ = NULL;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21263 "Photo.c"
+#line 21278 "Photo.c"
 				PixelTransformer* _tmp3_ = NULL;
 				PixelTransformer* _tmp4_ = NULL;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->transformer;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = pixel_transformer_copy (_tmp3_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21274 "Photo.c"
+#line 21289 "Photo.c"
 			} else {
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 21280 "Photo.c"
+#line 21295 "Photo.c"
 			}
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->adjustments;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != NULL) {
-#line 21286 "Photo.c"
+#line 21301 "Photo.c"
 				PixelTransformationBundle* _tmp7_ = NULL;
 				PixelTransformationBundle* _tmp8_ = NULL;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->adjustments;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = pixel_transformation_bundle_copy (_tmp7_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 21297 "Photo.c"
+#line 21312 "Photo.c"
 			} else {
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = NULL;
-#line 21303 "Photo.c"
+#line 21318 "Photo.c"
 			}
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->orientation;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_->transformations;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_photo_transformation_state_impl_new (self, _tmp10_, _tmp12_, _tmp1_, _tmp5_);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (_tmp1_);
-#line 21321 "Photo.c"
+#line 21336 "Photo.c"
 			{
 				PhotoRow* _tmp14_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21328 "Photo.c"
+#line 21343 "Photo.c"
 			}
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21332 "Photo.c"
+#line 21347 "Photo.c"
 		}
-		__finally367:
+		__finally368:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21341 "Photo.c"
+#line 21356 "Photo.c"
 		}
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 21349 "Photo.c"
+#line 21364 "Photo.c"
 	}
 }
 
 
 static gpointer _pixel_transformer_ref0 (gpointer self) {
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 21357 "Photo.c"
+#line 21372 "Photo.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21364 "Photo.c"
+#line 21379 "Photo.c"
 }
 
 
@@ -21387,60 +21402,60 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	gboolean committed = FALSE;
 	gboolean _tmp30_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE);
-#line 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) _tmp0_) : NULL);
-#line 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 	state_impl = _tmp1_;
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state_impl;
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (state_impl);
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 21409 "Photo.c"
+#line 21424 "Photo.c"
 	}
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_);
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_orientation = _tmp4_;
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = state_impl;
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_);
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformations = _tmp6_;
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = state_impl;
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_);
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformer = _tmp8_;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = state_impl;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_adjustments = _tmp10_;
-#line 21435 "Photo.c"
+#line 21450 "Photo.c"
 	{
 		PhotoRow* _tmp11_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = self->row;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21442 "Photo.c"
+#line 21457 "Photo.c"
 		{
 			PhotoTable* _tmp12_ = NULL;
 			PhotoTable* _tmp13_ = NULL;
@@ -21450,29 +21465,29 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			GeeHashMap* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = saved_orientation;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = saved_transformations;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_);
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp18_;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
-			_database_table_unref0 (_tmp13_);
 #line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+			_database_table_unref0 (_tmp13_);
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = committed;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21474 "Photo.c"
+#line 21489 "Photo.c"
 				PhotoRow* _tmp20_ = NULL;
 				Orientation _tmp21_ = 0;
 				PhotoRow* _tmp22_ = NULL;
@@ -21482,108 +21497,108 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 				PixelTransformer* _tmp26_ = NULL;
 				PixelTransformationBundle* _tmp27_ = NULL;
 				PixelTransformationBundle* _tmp28_ = NULL;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->row;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = saved_orientation;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_->orientation = _tmp21_;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = saved_transformations;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp22_->transformations);
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_->transformations = _tmp24_;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = saved_transformer;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _pixel_transformer_ref0 (_tmp25_);
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp26_;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = saved_adjustments;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp28_;
-#line 21516 "Photo.c"
+#line 21531 "Photo.c"
 			}
 		}
-		__finally368:
+		__finally369:
 		{
 			PhotoRow* _tmp29_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = self->row;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21526 "Photo.c"
+#line 21541 "Photo.c"
 		}
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (saved_transformer);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (saved_transformations);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (state_impl);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21544 "Photo.c"
+#line 21559 "Photo.c"
 		}
 	}
-#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = committed;
-#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp30_) {
-#line 21551 "Photo.c"
+#line 21566 "Photo.c"
 		Alteration* _tmp31_ = NULL;
 		Alteration* _tmp32_ = NULL;
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = alteration_new ("image", "transformation-state");
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_;
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_);
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp32_);
-#line 21562 "Photo.c"
+#line 21577 "Photo.c"
 	}
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (saved_transformer);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (saved_transformations);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (state_impl);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21576 "Photo.c"
+#line 21591 "Photo.c"
 }
 
 
 void photo_remove_all_transformations (Photo* self) {
-#line 2802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2804 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2805 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, TRUE);
-#line 21585 "Photo.c"
+#line 21600 "Photo.c"
 }
 
 
@@ -21592,18 +21607,18 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 	gboolean _tmp21_ = FALSE;
 	gboolean _tmp22_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21598 "Photo.c"
+#line 21613 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21605 "Photo.c"
+#line 21620 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -21615,45 +21630,45 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			Orientation _tmp8_ = 0;
 			BackingPhotoRow* _tmp9_ = NULL;
 			Orientation _tmp10_ = 0;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_);
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_altered = _tmp5_;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp6_->transformations);
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp6_->transformations = NULL;
 #line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp6_->transformations = NULL;
+#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (self->priv->transformer);
-#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->priv->transformer = NULL;
-#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
-			self->priv->adjustments = NULL;
 #line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+			self->priv->adjustments = NULL;
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->orientation;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->backing_photo_row;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->original_orientation;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != _tmp10_) {
-#line 21655 "Photo.c"
+#line 21670 "Photo.c"
 				PhotoTable* _tmp11_ = NULL;
 				PhotoTable* _tmp12_ = NULL;
 				PhotoRow* _tmp13_ = NULL;
@@ -21663,85 +21678,85 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 				PhotoRow* _tmp17_ = NULL;
 				BackingPhotoRow* _tmp18_ = NULL;
 				Orientation _tmp19_ = 0;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_get_instance ();
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->row;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_->photo_id;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->backing_photo_row;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_);
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
-				_database_table_unref0 (_tmp12_);
 #line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+				_database_table_unref0 (_tmp12_);
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->backing_photo_row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp18_->original_orientation;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_->orientation = _tmp19_;
-#line 2819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2821 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_altered = TRUE;
-#line 21691 "Photo.c"
+#line 21706 "Photo.c"
 			}
 		}
-		__finally369:
+		__finally370:
 		{
 			PhotoRow* _tmp20_ = NULL;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21701 "Photo.c"
+#line 21716 "Photo.c"
 		}
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 21711 "Photo.c"
+#line 21726 "Photo.c"
 		}
 	}
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = is_altered;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 21718 "Photo.c"
+#line 21733 "Photo.c"
 		gboolean _tmp23_ = FALSE;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21724 "Photo.c"
+#line 21739 "Photo.c"
 	} else {
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21728 "Photo.c"
+#line 21743 "Photo.c"
 	}
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21732 "Photo.c"
+#line 21747 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "revert");
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 21743 "Photo.c"
+#line 21758 "Photo.c"
 	}
 }
 
@@ -21749,54 +21764,54 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 Orientation photo_get_original_orientation (Photo* self) {
 	Orientation result = 0;
 	GError * _inner_error_ = NULL;
-#line 2827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21753 "Photo.c"
+#line 21768 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21760 "Photo.c"
+#line 21775 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->original_orientation;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21770 "Photo.c"
+#line 21785 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21777 "Photo.c"
+#line 21792 "Photo.c"
 			}
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21781 "Photo.c"
+#line 21796 "Photo.c"
 		}
-		__finally370:
+		__finally371:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21790 "Photo.c"
+#line 21805 "Photo.c"
 		}
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21798 "Photo.c"
+#line 21813 "Photo.c"
 	}
 }
 
@@ -21804,54 +21819,54 @@ Orientation photo_get_original_orientation (Photo* self) {
 Orientation photo_get_orientation (Photo* self) {
 	Orientation result = 0;
 	GError * _inner_error_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21808 "Photo.c"
+#line 21823 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21815 "Photo.c"
+#line 21830 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21825 "Photo.c"
+#line 21840 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21832 "Photo.c"
+#line 21847 "Photo.c"
 			}
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21836 "Photo.c"
+#line 21851 "Photo.c"
 		}
-		__finally371:
+		__finally372:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21845 "Photo.c"
+#line 21860 "Photo.c"
 		}
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21853 "Photo.c"
+#line 21868 "Photo.c"
 	}
 }
 
@@ -21861,31 +21876,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	gboolean committed = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 21867 "Photo.c"
+#line 21882 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21874 "Photo.c"
+#line 21889 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
 			Orientation _tmp3_ = 0;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21887 "Photo.c"
+#line 21902 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoRow* _tmp6_ = NULL;
@@ -21893,96 +21908,96 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				Orientation _tmp8_ = 0;
 				gboolean _tmp9_ = FALSE;
 				gboolean _tmp10_ = FALSE;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->photo_id;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = orientation;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_);
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp9_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = committed;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 21915 "Photo.c"
+#line 21930 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 					Orientation _tmp12_ = 0;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = orientation;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 21924 "Photo.c"
+#line 21939 "Photo.c"
 				}
 			}
 		}
-		__finally372:
+		__finally373:
 		{
 			PhotoRow* _tmp13_ = NULL;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21935 "Photo.c"
+#line 21950 "Photo.c"
 		}
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21945 "Photo.c"
+#line 21960 "Photo.c"
 		}
 	}
-#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = committed;
-#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 21952 "Photo.c"
+#line 21967 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "orientation");
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 21963 "Photo.c"
+#line 21978 "Photo.c"
 	}
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21969 "Photo.c"
+#line 21984 "Photo.c"
 }
 
 
 gboolean photo_check_can_rotate (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2857 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->can_rotate_now;
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21984 "Photo.c"
+#line 21999 "Photo.c"
 }
 
 
@@ -21990,134 +22005,134 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 	GError * _inner_error_ = NULL;
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21996 "Photo.c"
+#line 22011 "Photo.c"
 		{
 			Orientation _tmp1_ = 0;
 			Rotation _tmp2_ = 0;
 			Orientation _tmp3_ = 0;
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_orientation (self);
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rotation;
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp3_);
-#line 22009 "Photo.c"
+#line 22024 "Photo.c"
 		}
-		__finally373:
+		__finally374:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22018 "Photo.c"
+#line 22033 "Photo.c"
 		}
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 22028 "Photo.c"
+#line 22043 "Photo.c"
 		}
 	}
 }
 
 
 void photo_rotate (Photo* self, Rotation rotation) {
-#line 2859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22039 "Photo.c"
+#line 22054 "Photo.c"
 }
 
 
 static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22050 "Photo.c"
+#line 22065 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22057 "Photo.c"
+#line 22072 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
 			GeeHashMap* _tmp3_ = NULL;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->transformations;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22068 "Photo.c"
+#line 22083 "Photo.c"
 				PhotoRow* _tmp4_ = NULL;
 				GeeHashMap* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->transformations;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = name;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 22083 "Photo.c"
+#line 22098 "Photo.c"
 			} else {
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22087 "Photo.c"
+#line 22102 "Photo.c"
 			}
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22091 "Photo.c"
+#line 22106 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22098 "Photo.c"
+#line 22113 "Photo.c"
 			}
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22102 "Photo.c"
+#line 22117 "Photo.c"
 		}
-		__finally374:
+		__finally375:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22111 "Photo.c"
+#line 22126 "Photo.c"
 		}
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22119 "Photo.c"
+#line 22134 "Photo.c"
 	}
 }
 
@@ -22126,111 +22141,111 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 	KeyValueMap* result = NULL;
 	KeyValueMap* map = NULL;
 	GError * _inner_error_ = NULL;
-#line 2874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = NULL;
-#line 22134 "Photo.c"
+#line 22149 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22141 "Photo.c"
+#line 22156 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22151 "Photo.c"
+#line 22166 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
 				gpointer _tmp6_ = NULL;
 				KeyValueMap* _tmp7_ = NULL;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_key_value_map_unref0 (map);
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				map = (KeyValueMap*) _tmp6_;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = map;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp7_ != NULL) {
-#line 22173 "Photo.c"
+#line 22188 "Photo.c"
 					KeyValueMap* _tmp8_ = NULL;
 					KeyValueMap* _tmp9_ = NULL;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = map;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = key_value_map_copy (_tmp8_);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_key_value_map_unref0 (map);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					map = _tmp9_;
-#line 22184 "Photo.c"
+#line 22199 "Photo.c"
 				}
 			}
 		}
-		__finally375:
+		__finally376:
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22195 "Photo.c"
+#line 22210 "Photo.c"
 		}
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 22207 "Photo.c"
+#line 22222 "Photo.c"
 		}
 	}
-#line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = map;
-#line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22214 "Photo.c"
+#line 22229 "Photo.c"
 }
 
 
 static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22225 "Photo.c"
+#line 22240 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22232 "Photo.c"
+#line 22247 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22247,88 +22262,88 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			KeyValueMap* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			gboolean _tmp17_ = FALSE;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22255 "Photo.c"
+#line 22270 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp3_->transformations);
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22266 "Photo.c"
+#line 22281 "Photo.c"
 			}
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->transformations;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = trans;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = key_value_map_get_group (_tmp7_);
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = trans;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp9_);
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_free0 (_tmp9_);
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_table_get_instance ();
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->photo_id;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = trans;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp12_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 22302 "Photo.c"
+#line 22317 "Photo.c"
 			{
 				PhotoRow* _tmp18_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22309 "Photo.c"
+#line 22324 "Photo.c"
 			}
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22313 "Photo.c"
+#line 22328 "Photo.c"
 		}
-		__finally376:
+		__finally377:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22322 "Photo.c"
+#line 22337 "Photo.c"
 		}
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22330 "Photo.c"
+#line 22345 "Photo.c"
 	}
 }
 
@@ -22340,18 +22355,18 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22346 "Photo.c"
+#line 22361 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22353 "Photo.c"
+#line 22368 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22361,13 +22376,13 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			PhotoID _tmp15_ = {0};
 			const gchar* _tmp16_ = NULL;
 			gboolean _tmp17_ = FALSE;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22369 "Photo.c"
+#line 22384 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22376,111 +22391,111 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 				GeeHashMap* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL);
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = _tmp6_;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->transformations;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_MAP, GeeMap));
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22398 "Photo.c"
+#line 22413 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp11_->transformations);
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22406 "Photo.c"
+#line 22421 "Photo.c"
 				}
 			} else {
-#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22411 "Photo.c"
+#line 22426 "Photo.c"
 			}
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = name;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_);
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			altered_persistent = _tmp17_;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 22429 "Photo.c"
+#line 22444 "Photo.c"
 		}
-		__finally377:
+		__finally378:
 		{
 			PhotoRow* _tmp18_ = NULL;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22438 "Photo.c"
+#line 22453 "Photo.c"
 		}
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 22448 "Photo.c"
+#line 22463 "Photo.c"
 		}
 	}
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = altered_cache;
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = TRUE;
-#line 22457 "Photo.c"
+#line 22472 "Photo.c"
 	} else {
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = altered_persistent;
-#line 22461 "Photo.c"
+#line 22476 "Photo.c"
 	}
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22467 "Photo.c"
+#line 22482 "Photo.c"
 }
 
 
 gboolean photo_has_crop (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2918 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "crop");
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22482 "Photo.c"
+#line 22497 "Photo.c"
 }
 
 
@@ -22510,136 +22525,136 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
-#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2922 "/home/jens/Source/shotwell/src/Photo.vala"
-	box_init (&_vala_crop, 0, 0, 0, 0);
 #line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
+	box_init (&_vala_crop, 0, 0, 0, 0);
+#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "crop");
-#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22532 "Photo.c"
+#line 22547 "Photo.c"
 		}
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22536 "Photo.c"
+#line 22551 "Photo.c"
 	}
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_int (_tmp2_, "left", -1);
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	left = _tmp3_;
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "top", -1);
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	top = _tmp5_;
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = map;
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = key_value_map_get_int (_tmp6_, "right", -1);
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	right = _tmp7_;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = map;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1);
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
-	bottom = _tmp9_;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+	bottom = _tmp9_;
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = left;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == -1) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 22568 "Photo.c"
+#line 22583 "Photo.c"
 	} else {
 		gint _tmp14_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22575 "Photo.c"
+#line 22590 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 22581 "Photo.c"
+#line 22596 "Photo.c"
 	} else {
 		gint _tmp15_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22588 "Photo.c"
+#line 22603 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = TRUE;
-#line 22594 "Photo.c"
+#line 22609 "Photo.c"
 	} else {
 		gint _tmp16_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22601 "Photo.c"
+#line 22616 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22613 "Photo.c"
+#line 22628 "Photo.c"
 		}
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22617 "Photo.c"
+#line 22632 "Photo.c"
 	}
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = top;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = right;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = bottom;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
-	box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_);
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+	box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_);
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22637 "Photo.c"
+#line 22652 "Photo.c"
 	}
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22641 "Photo.c"
+#line 22656 "Photo.c"
 }
 
 
@@ -22660,68 +22675,68 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 	gint _tmp12_ = 0;
 	KeyValueMap* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 2943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("crop");
-#line 2943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *crop;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.left;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp1_, "left", _tmp3_);
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = *crop;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.top;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp4_, "top", _tmp6_);
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = map;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *crop;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.right;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp7_, "right", _tmp9_);
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = map;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = *crop;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = _tmp11_.bottom;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_int (_tmp10_, "bottom", _tmp12_);
 #line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_int (_tmp10_, "bottom", _tmp12_);
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = map;
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_set_transformation (self, _tmp13_);
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 22708 "Photo.c"
+#line 22723 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "crop");
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 22719 "Photo.c"
+#line 22734 "Photo.c"
 	}
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22723 "Photo.c"
+#line 22738 "Photo.c"
 }
 
 
@@ -22733,51 +22748,51 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	KeyValueMap* _tmp1_ = NULL;
 	KeyValueMap* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "straighten");
-#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_angle = 0.0;
 #line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_angle = 0.0;
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (angle) {
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 			*angle = _vala_angle;
-#line 22755 "Photo.c"
+#line 22770 "Photo.c"
 		}
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22759 "Photo.c"
+#line 22774 "Photo.c"
 	}
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0);
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_angle = _tmp3_;
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_angle = _tmp3_;
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (angle) {
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 		*angle = _vala_angle;
-#line 22775 "Photo.c"
+#line 22790 "Photo.c"
 	}
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22779 "Photo.c"
+#line 22794 "Photo.c"
 }
 
 
@@ -22788,40 +22803,40 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp2_ = 0.0;
 	KeyValueMap* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("straighten");
-#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = theta;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_double (_tmp1_, "angle", _tmp2_);
 #line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_double (_tmp1_, "angle", _tmp2_);
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = map;
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_set_transformation (self, _tmp3_);
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 22808 "Photo.c"
+#line 22823 "Photo.c"
 		Alteration* _tmp5_ = NULL;
 		Alteration* _tmp6_ = NULL;
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = alteration_new ("image", "straighten");
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp6_);
-#line 22819 "Photo.c"
+#line 22834 "Photo.c"
 	}
-#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22823 "Photo.c"
+#line 22838 "Photo.c"
 }
 
 
@@ -22843,81 +22858,81 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	GdkPoint _tmp9_ = {0};
 	EditingToolsRedeyeInstance* _tmp47_ = NULL;
 	gint _tmp47__length1 = 0;
-#line 2976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 2977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22855 "Photo.c"
+#line 22870 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp2_ = NULL;
 		EditingToolsRedeyeInstance* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0);
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3__length1 = 0;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (result_length1) {
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result_length1 = _tmp3__length1;
-#line 22869 "Photo.c"
+#line 22884 "Photo.c"
 		}
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22877 "Photo.c"
+#line 22892 "Photo.c"
 	}
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp6_ > 0, "num_points > 0");
 #line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp6_ > 0, "num_points > 0");
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_);
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	res = _tmp8_;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	res_length1 = _tmp7_;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
-	_res_size_ = res_length1;
 #line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+	_res_size_ = res_length1;
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_.x = 0;
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point = _tmp9_;
-#line 2987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.x = -1;
-#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.y = -1;
-#line 22907 "Photo.c"
+#line 22922 "Photo.c"
 	{
 		gint i = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 22912 "Photo.c"
+#line 22927 "Photo.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = TRUE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 22919 "Photo.c"
+#line 22934 "Photo.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gchar* center_key = NULL;
@@ -22960,158 +22975,158 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				gint _tmp44_ = 0;
 				EditingToolsRedeyeInstance _tmp45_ = {0};
 				gint _tmp46_ = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 22964 "Photo.c"
+#line 22979 "Photo.c"
 					gint _tmp11_ = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 22970 "Photo.c"
+#line 22985 "Photo.c"
 				}
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = i;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = num_points;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp12_ < _tmp13_)) {
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 22982 "Photo.c"
+#line 22997 "Photo.c"
 				}
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = g_strdup_printf ("center%d", _tmp14_);
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				center_key = _tmp15_;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_strdup_printf ("radius%d", _tmp16_);
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
-				radius_key = _tmp17_;
 #line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+				radius_key = _tmp17_;
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = res;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18__length1 = res_length1;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = i;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = map;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = center_key;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = default_point;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_);
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_[_tmp19_].center = _tmp23_;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = res;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24__length1 = res_length1;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = i;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _tmp24_[_tmp25_];
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_.center;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _tmp27_.x;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = default_point;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp29_.x;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x");
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = res;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31__length1 = res_length1;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = i;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp31_[_tmp32_];
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_.center;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_.y;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = default_point;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_.y;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y");
 #line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+				_vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y");
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = res;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38__length1 = res_length1;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = i;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = map;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = radius_key;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1);
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_[_tmp39_].radius = _tmp42_;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = res;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43__length1 = res_length1;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = i;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp43_[_tmp44_];
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = _tmp45_.radius;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp46_ != -1, "res[i].radius != -1");
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (radius_key);
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (center_key);
-#line 23078 "Photo.c"
+#line 23093 "Photo.c"
 			}
 		}
 	}
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = res;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47__length1 = res_length1;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp47__length1;
-#line 23090 "Photo.c"
+#line 23105 "Photo.c"
 	}
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23098 "Photo.c"
+#line 23113 "Photo.c"
 }
 
 
 gboolean photo_has_redeye_transformations (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "redeye");
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23113 "Photo.c"
+#line 23128 "Photo.c"
 }
 
 
@@ -23142,111 +23157,111 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	gint _tmp21_ = 0;
 	KeyValueMap* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (redeye != NULL);
-#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23156 "Photo.c"
+#line 23171 "Photo.c"
 		KeyValueMap* _tmp2_ = NULL;
 		KeyValueMap* _tmp3_ = NULL;
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = key_value_map_new ("redeye");
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		map = _tmp2_;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = map;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 		key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23169 "Photo.c"
+#line 23184 "Photo.c"
 	}
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 3018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 3018 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp6_ >= 0, "num_points >= 0");
 #line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp6_ >= 0, "num_points >= 0");
+#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
-	num_points = _tmp7_ + 1;
 #line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+	num_points = _tmp7_ + 1;
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = num_points;
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1);
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	radius_key = _tmp9_;
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = num_points;
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1);
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
-	center_key = _tmp11_;
 #line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+	center_key = _tmp11_;
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = map;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = radius_key;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = *redeye;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.radius;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_);
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = map;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = center_key;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = *redeye;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.center;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_);
 #line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_);
+#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = map;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = num_points;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_int (_tmp20_, "num_points", _tmp21_);
 #line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_int (_tmp20_, "num_points", _tmp21_);
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = map;
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_set_transformation (self, _tmp22_);
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 23229 "Photo.c"
+#line 23244 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "redeye");
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 23240 "Photo.c"
+#line 23255 "Photo.c"
 	}
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (radius_key);
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 23248 "Photo.c"
+#line 23263 "Photo.c"
 }
 
 
@@ -23255,89 +23270,89 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 	Dimensions _vala_scaled_to_viewport = {0};
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23261 "Photo.c"
+#line 23276 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23268 "Photo.c"
+#line 23283 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			PhotoException _tmp2_ = 0;
 			Dimensions _tmp3_ = {0};
 			Dimensions _tmp4_ = {0};
 			gboolean _tmp5_ = FALSE;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = exceptions;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp3_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp4_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 23287 "Photo.c"
+#line 23302 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23294 "Photo.c"
+#line 23309 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_image) {
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_image = _vala_scaled_image;
-#line 23300 "Photo.c"
+#line 23315 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_to_viewport) {
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23306 "Photo.c"
+#line 23321 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23310 "Photo.c"
+#line 23325 "Photo.c"
 		}
-		__finally378:
+		__finally379:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23319 "Photo.c"
+#line 23334 "Photo.c"
 		}
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 23327 "Photo.c"
+#line 23342 "Photo.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23333 "Photo.c"
+#line 23348 "Photo.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23339 "Photo.c"
+#line 23354 "Photo.c"
 	}
 }
 
@@ -23361,72 +23376,72 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	gint _tmp57_ = 0;
 	gboolean _tmp63_ = FALSE;
 	gboolean _tmp64_ = FALSE;
-#line 3055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3055 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (scaling != NULL, FALSE);
 #line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (scaling != NULL, FALSE);
+#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
-	raw = _tmp0_;
 #line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+	raw = _tmp0_;
+#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_is_unscaled (scaling);
-#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 23375 "Photo.c"
+#line 23390 "Photo.c"
 		Dimensions _tmp2_ = {0};
 		Dimensions _tmp3_ = {0};
-#line 3060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = raw;
-#line 3060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp2_;
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = raw;
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_scaled_to_viewport = _tmp3_;
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_scaled_to_viewport = _tmp3_;
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23392 "Photo.c"
+#line 23407 "Photo.c"
 		}
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23398 "Photo.c"
+#line 23413 "Photo.c"
 		}
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23402 "Photo.c"
+#line 23417 "Photo.c"
 	}
-#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
-#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp4_;
-#line 3071 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3073 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_vala_scaled_image, 0, 0);
-#line 3072 "/home/jens/Source/shotwell/src/Photo.vala"
-	dimensions_init (&_vala_scaled_to_viewport, 0, 0);
 #line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+	dimensions_init (&_vala_scaled_to_viewport, 0, 0);
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = exceptions;
-#line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
-#line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 23418 "Photo.c"
+#line 23433 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
 		gboolean _tmp8_ = FALSE;
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo_get_raw_crop (self, &_tmp7_);
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp7_;
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23428 "Photo.c"
+#line 23443 "Photo.c"
 			Dimensions rotated_raw = {0};
 			Dimensions _tmp9_ = {0};
 			PhotoException _tmp10_ = 0;
@@ -23444,17 +23459,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			Dimensions _tmp32_ = {0};
 			PhotoException _tmp33_ = 0;
 			gboolean _tmp34_ = FALSE;
-#line 3079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = raw;
-#line 3079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp9_;
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = exceptions;
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 23456 "Photo.c"
+#line 23471 "Photo.c"
 				Orientation _tmp12_ = 0;
 				Dimensions _tmp13_ = {0};
 				Box _tmp14_ = {0};
@@ -23462,125 +23477,125 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				Orientation _tmp16_ = 0;
 				Dimensions _tmp17_ = {0};
 				Dimensions _tmp18_ = {0};
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = orientation;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = raw;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = crop;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_);
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				crop = _tmp15_;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = orientation;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = raw;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				rotated_raw = _tmp18_;
-#line 23482 "Photo.c"
+#line 23497 "Photo.c"
 			}
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_scaled (&crop, &_tmp20_, &_tmp21_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_crop = _tmp21_;
-#line 3089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp22_);
-#line 3089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp22_;
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = box_get_width (&crop);
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = box_get_width (&scaled_crop);
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ <= _tmp25_) {
-#line 23502 "Photo.c"
+#line 23517 "Photo.c"
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = box_get_height (&crop);
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = box_get_height (&scaled_crop);
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23511 "Photo.c"
+#line 23526 "Photo.c"
 			} else {
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23515 "Photo.c"
+#line 23530 "Photo.c"
 			}
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23519 "Photo.c"
+#line 23534 "Photo.c"
 				Dimensions _tmp28_ = {0};
 				Dimensions _tmp29_ = {0};
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = raw;
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp28_;
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 				box_get_dimensions (&crop, &_tmp29_);
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_scaled_to_viewport = _tmp29_;
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+				_vala_scaled_to_viewport = _tmp29_;
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_image) {
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_image = _vala_scaled_image;
-#line 23536 "Photo.c"
+#line 23551 "Photo.c"
 				}
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_to_viewport) {
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23542 "Photo.c"
+#line 23557 "Photo.c"
 				}
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23546 "Photo.c"
+#line 23561 "Photo.c"
 			}
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp31_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp32_;
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = exceptions;
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp34_) {
-#line 23562 "Photo.c"
+#line 23577 "Photo.c"
 				Orientation _tmp35_ = 0;
 				Dimensions _tmp36_ = {0};
 				Dimensions _tmp37_ = {0};
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = orientation;
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _vala_scaled_image;
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp37_;
-#line 23574 "Photo.c"
+#line 23589 "Photo.c"
 			}
 		}
 	}
-#line 3112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = dimensions_has_area (&_vala_scaled_image);
-#line 3112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 23582 "Photo.c"
+#line 23597 "Photo.c"
 		Dimensions rotated_raw = {0};
 		Dimensions _tmp39_ = {0};
 		PhotoException _tmp40_ = 0;
@@ -23590,143 +23605,143 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		Dimensions _tmp47_ = {0};
 		PhotoException _tmp48_ = 0;
 		gboolean _tmp49_ = FALSE;
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = raw;
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 		rotated_raw = _tmp39_;
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = exceptions;
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 23602 "Photo.c"
+#line 23617 "Photo.c"
 			Orientation _tmp42_ = 0;
 			Dimensions _tmp43_ = {0};
 			Dimensions _tmp44_ = {0};
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = orientation;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = raw;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp44_;
-#line 23614 "Photo.c"
+#line 23629 "Photo.c"
 		}
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_);
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp46_;
-#line 3119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = _vala_scaled_image;
-#line 3119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_to_viewport = _tmp47_;
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = exceptions;
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp49_) {
-#line 23632 "Photo.c"
+#line 23647 "Photo.c"
 			Orientation _tmp50_ = 0;
 			Dimensions _tmp51_ = {0};
 			Dimensions _tmp52_ = {0};
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = orientation;
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = _vala_scaled_image;
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp52_;
-#line 23644 "Photo.c"
+#line 23659 "Photo.c"
 		}
 	}
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _vala_scaled_image;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_.width;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = raw;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = _tmp56_.width;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_ >= _tmp57_) {
-#line 23657 "Photo.c"
+#line 23672 "Photo.c"
 		Dimensions _tmp58_ = {0};
 		gint _tmp59_ = 0;
 		Dimensions _tmp60_ = {0};
 		gint _tmp61_ = 0;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _vala_scaled_image;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_.height;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = raw;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_.height;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23672 "Photo.c"
+#line 23687 "Photo.c"
 	} else {
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23676 "Photo.c"
+#line 23691 "Photo.c"
 	}
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23680 "Photo.c"
+#line 23695 "Photo.c"
 		Dimensions _tmp62_ = {0};
-#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
-#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_scaled_image = _tmp62_;
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_scaled_image = _tmp62_;
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23692 "Photo.c"
+#line 23707 "Photo.c"
 		}
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23698 "Photo.c"
+#line 23713 "Photo.c"
 		}
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23702 "Photo.c"
+#line 23717 "Photo.c"
 	}
-#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
-#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp63_, "scaled_image.has_area()");
-#line 3134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport);
-#line 3134 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp64_, "scaled_to_viewport.has_area()");
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp64_, "scaled_to_viewport.has_area()");
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23718 "Photo.c"
+#line 23733 "Photo.c"
 	}
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23724 "Photo.c"
+#line 23739 "Photo.c"
 	}
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23728 "Photo.c"
+#line 23743 "Photo.c"
 }
 
 
@@ -23754,141 +23769,141 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	Dimensions _tmp22_ = {0};
 	gboolean _tmp23_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = fetch_mode;
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_backing_reader (self, _tmp0_);
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	loader = _tmp1_;
-#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = scaling_is_unscaled (scaling);
-#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 23770 "Photo.c"
+#line 23785 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
 		PhotoFileReader* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = loader;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23789 "Photo.c"
+#line 23804 "Photo.c"
 		}
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp6_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23803 "Photo.c"
+#line 23818 "Photo.c"
 	}
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = exceptions;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_);
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_image = _tmp9_;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_to_viewport = _tmp10_;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
-	is_scaled = _tmp11_;
 #line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+	is_scaled = _tmp11_;
+#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = is_scaled;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp12_) {
-#line 23821 "Photo.c"
+#line 23836 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		PhotoFileReader* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = loader;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp15_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23840 "Photo.c"
+#line 23855 "Photo.c"
 		}
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = NULL;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp16_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp13_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23854 "Photo.c"
+#line 23869 "Photo.c"
 	}
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp18_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = scaled_image;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp20_;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23874 "Photo.c"
+#line 23889 "Photo.c"
 	}
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_for_pixbuf (_tmp21_, &_tmp22_);
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE);
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
 #line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
+#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (loader);
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23890 "Photo.c"
+#line 23905 "Photo.c"
 }
 
 
@@ -23900,37 +23915,37 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23920 "Photo.c"
+#line 23935 "Photo.c"
 	}
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23932 "Photo.c"
+#line 23947 "Photo.c"
 }
 
 
@@ -23942,37 +23957,37 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23962 "Photo.c"
+#line 23977 "Photo.c"
 	}
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23974 "Photo.c"
+#line 23989 "Photo.c"
 }
 
 
@@ -23987,93 +24002,93 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	GdkPixbuf* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 23993 "Photo.c"
+#line 24008 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24000 "Photo.c"
+#line 24015 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			Dimensions _tmp2_ = {0};
 			Dimensions _tmp3_ = {0};
 			Orientation _tmp4_ = 0;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_calculate_pixbuf_dimensions (self, &_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_, &_tmp3_);
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_image = _tmp2_;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
-			scaled_to_viewport = _tmp3_;
 #line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+			scaled_to_viewport = _tmp3_;
+#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_original_orientation (self);
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_orientation = _tmp4_;
-#line 24018 "Photo.c"
+#line 24033 "Photo.c"
 		}
-		__finally379:
+		__finally380:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24027 "Photo.c"
+#line 24042 "Photo.c"
 		}
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 24035 "Photo.c"
+#line 24050 "Photo.c"
 		}
 	}
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = *scaling;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = fetch_mode;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_);
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp8_;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24052 "Photo.c"
+#line 24067 "Photo.c"
 	}
-#line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = rotate;
-#line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_) {
-#line 24058 "Photo.c"
+#line 24073 "Photo.c"
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = pixbuf;
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_);
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp11_;
-#line 24069 "Photo.c"
+#line 24084 "Photo.c"
 	}
-#line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24075 "Photo.c"
+#line 24090 "Photo.c"
 }
 
 
@@ -24085,35 +24100,35 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 3233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24103 "Photo.c"
+#line 24118 "Photo.c"
 	}
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24115 "Photo.c"
+#line 24130 "Photo.c"
 }
 
 
@@ -24133,34 +24148,34 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
      * it moves to the head of the LRU.
      */
 static gpointer _photo_cached_pixbuf_ref0 (gpointer self) {
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24137 "Photo.c"
+#line 24152 "Photo.c"
 }
 
 
 static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
 	gboolean result;
 	result = photo_trim_source_pixbuf_cache ();
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24146 "Photo.c"
+#line 24161 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) {
 	GdkPixbuf* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 3252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24155 "Photo.c"
+#line 24170 "Photo.c"
 	{
 		GeeLinkedList* _tmp0_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24162 "Photo.c"
+#line 24177 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
@@ -24180,21 +24195,21 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			GdkPixbuf* _tmp69_ = NULL;
 			PhotoCachedPixbuf* _tmp70_ = NULL;
 			GdkPixbuf* _tmp73_ = NULL;
-#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3256 "/home/jens/Source/shotwell/src/Photo.vala"
 			found = NULL;
-#line 3258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
 			min_elapsed = DBL_MAX;
-#line 3259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
 			count = 0;
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_source_pixbuf_cache;
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			iter = _tmp2_;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 24196 "Photo.c"
+#line 24211 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
@@ -24207,236 +24222,236 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp10_ = 0.0;
 				gboolean _tmp11_ = FALSE;
 				Photo* _tmp12_ = NULL;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = iter;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 24217 "Photo.c"
+#line 24232 "Photo.c"
 				}
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
-				cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_;
 #line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+				cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_;
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = cached_pixbuf;
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->last_touched;
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = trunc (_tmp9_);
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
-				elapsed = _tmp10_ + 1;
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+				elapsed = _tmp10_ + 1;
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = locate;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_ != NULL) {
-#line 24239 "Photo.c"
+#line 24254 "Photo.c"
 					PhotoCachedPixbuf* _tmp13_ = NULL;
 					Photo* _tmp14_ = NULL;
 					Photo* _tmp15_ = NULL;
 					gboolean _tmp16_ = FALSE;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = cached_pixbuf;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = _tmp13_->photo;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = locate;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource));
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp16_;
-#line 24254 "Photo.c"
+#line 24269 "Photo.c"
 				} else {
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24258 "Photo.c"
+#line 24273 "Photo.c"
 				}
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24262 "Photo.c"
+#line 24277 "Photo.c"
 					GeeIterator* _tmp17_ = NULL;
 					PhotoCachedPixbuf* _tmp18_ = NULL;
 					PhotoCachedPixbuf* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = iter;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_iterator_remove (_tmp17_);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = cached_pixbuf;
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					found = _tmp19_;
-#line 3272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = count;
-#line 3272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 					count = _tmp20_ + 1;
-#line 24283 "Photo.c"
+#line 24298 "Photo.c"
 				} else {
 					gdouble _tmp21_ = 0.0;
-#line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = elapsed;
-#line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24290 "Photo.c"
+#line 24305 "Photo.c"
 						GeeIterator* _tmp22_ = NULL;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp22_ = iter;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_iterator_remove (_tmp22_);
-#line 24296 "Photo.c"
+#line 24311 "Photo.c"
 					} else {
 						gint _tmp23_ = 0;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = count;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24303 "Photo.c"
+#line 24318 "Photo.c"
 							GeeIterator* _tmp24_ = NULL;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = iter;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_iterator_remove (_tmp24_);
-#line 24309 "Photo.c"
+#line 24324 "Photo.c"
 						} else {
 							gdouble _tmp25_ = 0.0;
 							gdouble _tmp26_ = 0.0;
 							gdouble _tmp27_ = 0.0;
 							gint _tmp28_ = 0;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = elapsed;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = min_elapsed;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = MIN (_tmp25_, _tmp26_);
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							min_elapsed = _tmp27_;
-#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = count;
-#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 							count = _tmp28_ + 1;
-#line 24327 "Photo.c"
+#line 24342 "Photo.c"
 						}
 					}
 				}
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24333 "Photo.c"
+#line 24348 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = found;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp31_ == NULL) {
-#line 24339 "Photo.c"
+#line 24354 "Photo.c"
 				Photo* _tmp32_ = NULL;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24345 "Photo.c"
+#line 24360 "Photo.c"
 			} else {
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24349 "Photo.c"
+#line 24364 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24353 "Photo.c"
+#line 24368 "Photo.c"
 				gboolean _tmp33_ = FALSE;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24359 "Photo.c"
+#line 24374 "Photo.c"
 			} else {
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24363 "Photo.c"
+#line 24378 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24367 "Photo.c"
+#line 24382 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
 				Photo* _tmp35_ = NULL;
 				Scaling _tmp36_ = {0};
 				GdkPixbuf* _tmp37_ = NULL;
 				Photo* _tmp38_ = NULL;
 				PhotoCachedPixbuf* _tmp39_ = NULL;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = locate;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				scaling_for_original (&_tmp36_);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp37_;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (iter);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 24388 "Photo.c"
-					goto __finally380;
+#line 24403 "Photo.c"
+					goto __finally381;
 				}
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_);
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (found);
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				found = _tmp39_;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp34_);
-#line 24401 "Photo.c"
+#line 24416 "Photo.c"
 			} else {
 				PhotoCachedPixbuf* _tmp40_ = NULL;
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24408 "Photo.c"
+#line 24423 "Photo.c"
 					PhotoCachedPixbuf* _tmp41_ = NULL;
 					GTimer* _tmp42_ = NULL;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = found;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->last_touched;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24417 "Photo.c"
+#line 24432 "Photo.c"
 				}
 			}
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = found;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp44_ != NULL) {
-#line 24424 "Photo.c"
+#line 24439 "Photo.c"
 				gboolean _tmp45_ = FALSE;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24430 "Photo.c"
+#line 24445 "Photo.c"
 			} else {
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24434 "Photo.c"
+#line 24449 "Photo.c"
 			}
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24438 "Photo.c"
+#line 24453 "Photo.c"
 				GeeLinkedList* _tmp46_ = NULL;
 				PhotoCachedPixbuf* _tmp47_ = NULL;
 				PhotoCachedPixbuf* _tmp48_ = NULL;
@@ -24444,157 +24459,157 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp50_ = 0.0;
 				gdouble _tmp51_ = 0.0;
 				gdouble _tmp52_ = 0.0;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_source_pixbuf_cache;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = found;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp47_);
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = found;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_->last_touched;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = g_timer_elapsed (_tmp49_, NULL);
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = min_elapsed;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = MIN (_tmp50_, _tmp51_);
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				min_elapsed = _tmp52_;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 24466 "Photo.c"
+#line 24481 "Photo.c"
 					GeeLinkedList* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					gint _tmp55_ = 0;
 					GeeLinkedList* _tmp56_ = NULL;
 					gpointer _tmp57_ = NULL;
 					PhotoCachedPixbuf* _tmp58_ = NULL;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = photo_source_pixbuf_cache;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = _tmp54_;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24483 "Photo.c"
+#line 24498 "Photo.c"
 					}
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque));
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24493 "Photo.c"
+#line 24508 "Photo.c"
 				}
 			}
-#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = photo_discard_source_id;
-#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp59_ != ((guint) 0)) {
-#line 24500 "Photo.c"
+#line 24515 "Photo.c"
 				guint _tmp60_ = 0U;
-#line 3311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
-#line 3311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_source_remove (_tmp60_);
-#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24508 "Photo.c"
+#line 24523 "Photo.c"
 			}
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_;
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24518 "Photo.c"
+#line 24533 "Photo.c"
 				gdouble _tmp64_ = 0.0;
 				guint retry_sec = 0U;
 				gdouble _tmp65_ = 0.0;
 				gdouble _tmp66_ = 0.0;
 				guint _tmp67_ = 0U;
 				guint _tmp68_ = 0U;
-#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = min_elapsed;
-#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0");
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = min_elapsed;
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = trunc (_tmp65_);
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_);
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = retry_sec;
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL);
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = _tmp68_;
-#line 24541 "Photo.c"
+#line 24556 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = found;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp70_ != NULL) {
-#line 24547 "Photo.c"
+#line 24562 "Photo.c"
 				PhotoCachedPixbuf* _tmp71_ = NULL;
 				GdkPixbuf* _tmp72_ = NULL;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = found;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_->pixbuf;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24556 "Photo.c"
+#line 24571 "Photo.c"
 			} else {
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24560 "Photo.c"
+#line 24575 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp73_;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (iter);
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_cached_pixbuf_unref0 (found);
-#line 24570 "Photo.c"
+#line 24585 "Photo.c"
 			{
 				GeeLinkedList* _tmp74_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24577 "Photo.c"
+#line 24592 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24581 "Photo.c"
+#line 24596 "Photo.c"
 		}
-		__finally380:
+		__finally381:
 		{
 			GeeLinkedList* _tmp75_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24590 "Photo.c"
+#line 24605 "Photo.c"
 		}
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24596 "Photo.c"
+#line 24611 "Photo.c"
 	}
 }
 
@@ -24605,46 +24620,46 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_);
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24615 "Photo.c"
-			goto __catch381_g_error;
+#line 24630 "Photo.c"
+			goto __catch382_g_error;
 		}
 	}
-	goto __finally381;
-	__catch381_g_error:
+	goto __finally382;
+	__catch382_g_error:
 	{
 		GError* err = NULL;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24629 "Photo.c"
+#line 24644 "Photo.c"
 	}
-	__finally381:
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally382:
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 24640 "Photo.c"
+#line 24655 "Photo.c"
 	}
-#line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24646 "Photo.c"
+#line 24661 "Photo.c"
 }
 
 
@@ -24662,39 +24677,39 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	GdkPixbuf* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3344 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_run_source_pixbuf_cache (self, TRUE, &_inner_error_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24676 "Photo.c"
+#line 24691 "Photo.c"
 	}
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp0_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24696 "Photo.c"
+#line 24711 "Photo.c"
 }
 
 
@@ -24703,46 +24718,46 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
      */
 void photo_discard_prefetched (Photo* self) {
 	GError * _inner_error_ = NULL;
-#line 3349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 24707 "Photo.c"
+#line 24722 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_);
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24719 "Photo.c"
-			goto __catch382_g_error;
+#line 24734 "Photo.c"
+			goto __catch383_g_error;
 		}
 	}
-	goto __finally382;
-	__catch382_g_error:
+	goto __finally383;
+	__catch383_g_error:
 	{
 		GError* err = NULL;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24733 "Photo.c"
+#line 24748 "Photo.c"
 	}
-	__finally382:
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally383:
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24744 "Photo.c"
+#line 24759 "Photo.c"
 	}
 }
 
@@ -24794,117 +24809,117 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	gboolean _tmp101_ = FALSE;
 	gboolean _tmp102_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_develop_raw_photos_to_files ();
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 24806 "Photo.c"
+#line 24821 "Photo.c"
 		PhotoFileFormat _tmp5_ = 0;
-#line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_get_master_file_format (self);
-#line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24812 "Photo.c"
+#line 24827 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24816 "Photo.c"
+#line 24831 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24820 "Photo.c"
+#line 24835 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		BackingFetchMode _tmp8_ = 0;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = fetch_mode;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24830 "Photo.c"
+#line 24845 "Photo.c"
 		} else {
 			BackingFetchMode _tmp9_ = 0;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = fetch_mode;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24837 "Photo.c"
+#line 24852 "Photo.c"
 		}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp7_) {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 24843 "Photo.c"
+#line 24858 "Photo.c"
 		} else {
 			BackingFetchMode _tmp10_ = 0;
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = fetch_mode;
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24850 "Photo.c"
+#line 24865 "Photo.c"
 		}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24854 "Photo.c"
+#line 24869 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24858 "Photo.c"
+#line 24873 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24862 "Photo.c"
+#line 24877 "Photo.c"
 		RawDeveloper _tmp11_ = 0;
 		gboolean _tmp12_ = FALSE;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_get_raw_developer (self);
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24871 "Photo.c"
+#line 24886 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24875 "Photo.c"
+#line 24890 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24879 "Photo.c"
+#line 24894 "Photo.c"
 		RawDeveloper _tmp13_ = 0;
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_raw_developer (self);
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_raw_developer (self, _tmp13_);
-#line 24885 "Photo.c"
+#line 24900 "Photo.c"
 	}
-#line 3390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
-#line 3391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3393 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&scaled, 0, 0);
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = NULL;
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances_length1 = 0;
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_redeye_instances_size_ = redeye_instances_length1;
-#line 3395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3397 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformer = NULL;
-#line 24899 "Photo.c"
+#line 24914 "Photo.c"
 	{
 		PhotoRow* _tmp14_ = NULL;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = self->row;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24906 "Photo.c"
+#line 24921 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
 			PhotoException _tmp16_ = 0;
@@ -24922,201 +24937,201 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gboolean _tmp28_ = FALSE;
 			gboolean _tmp29_ = FALSE;
 			Orientation _tmp31_ = 0;
-#line 3399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_);
-#line 3399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 			original = _tmp15_;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = exceptions;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled = _tmp18_;
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = scaled;
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
-			scaled_to_viewport = _tmp19_;
 #line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+			scaled_to_viewport = _tmp19_;
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp20_);
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = scaled;
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_);
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_scaled = !_tmp22_;
 #line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_scaled = !_tmp22_;
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = _tmp24_;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances_length1 = _tmp23_;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
-			_redeye_instances_size_ = redeye_instances_length1;
 #line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+			_redeye_instances_size_ = redeye_instances_length1;
+#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_get_raw_crop (self, &_tmp25_);
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop = _tmp25_;
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_cropped = _tmp26_;
 #line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_cropped = _tmp26_;
+#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = photo_get_raw_straighten (self, &_tmp27_);
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 			straightening_angle = _tmp27_;
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_straightened = _tmp28_;
 #line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_straightened = _tmp28_;
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = photo_has_color_adjustments (self);
-#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24974 "Photo.c"
+#line 24989 "Photo.c"
 				PixelTransformer* _tmp30_ = NULL;
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (transformer);
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 24982 "Photo.c"
+#line 24997 "Photo.c"
 			}
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = photo_get_orientation (self);
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation = _tmp31_;
-#line 24988 "Photo.c"
+#line 25003 "Photo.c"
 		}
-		__finally383:
+		__finally384:
 		{
 			PhotoRow* _tmp32_ = NULL;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = self->row;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24997 "Photo.c"
+#line 25012 "Photo.c"
 		}
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (transformer);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 25009 "Photo.c"
+#line 25024 "Photo.c"
 		}
 	}
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_get_prefetched_copy (self, &_inner_error_);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp33_;
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (transformer);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		redeye_instances = (g_free (redeye_instances), NULL);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 25026 "Photo.c"
+#line 25041 "Photo.c"
 	}
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 25034 "Photo.c"
+#line 25049 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp36_ = NULL;
 		gint _tmp36__length1 = 0;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = redeye_instances;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36__length1 = redeye_instances_length1;
-#line 25041 "Photo.c"
+#line 25056 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
 			gint _instance_collection_size_ = 0;
 			gint instance_it = 0;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection = _tmp36_;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection_length1 = _tmp36__length1;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25053 "Photo.c"
+#line 25068 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25057 "Photo.c"
+#line 25072 "Photo.c"
 				{
 					GdkPixbuf* _tmp37_ = NULL;
 					EditingToolsRedeyeInstance _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = pixbuf;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp38_ = instance;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_);
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pixbuf);
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					pixbuf = _tmp39_;
-#line 25072 "Photo.c"
+#line 25087 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = exceptions;
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 25083 "Photo.c"
+#line 25098 "Photo.c"
 		gboolean _tmp42_ = FALSE;
-#line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
-#line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25089 "Photo.c"
+#line 25104 "Photo.c"
 			GdkPixbuf* _tmp43_ = NULL;
 			gdouble _tmp44_ = 0.0;
 			GdkPixbuf* _tmp45_ = NULL;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = pixbuf;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = straightening_angle;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = rotate_arb (_tmp43_, _tmp44_);
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp45_;
-#line 25103 "Photo.c"
+#line 25118 "Photo.c"
 		}
 	}
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = exceptions;
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_) {
-#line 25112 "Photo.c"
+#line 25127 "Photo.c"
 		gboolean _tmp48_ = FALSE;
-#line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
-#line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25118 "Photo.c"
+#line 25133 "Photo.c"
 			Box _tmp49_ = {0};
 			gint _tmp50_ = 0;
 			GdkPixbuf* _tmp51_ = NULL;
@@ -25153,255 +25168,255 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gint _tmp82_ = 0;
 			gint _tmp83_ = 0;
 			GdkPixbuf* _tmp84_ = NULL;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = crop;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp49_.left;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = pixbuf;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = gdk_pixbuf_get_width (_tmp51_);
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = _tmp52_;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2);
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.left = _tmp54_;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = crop;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = _tmp55_.top;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = pixbuf;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = gdk_pixbuf_get_height (_tmp57_);
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = _tmp58_;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2);
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
-			crop.top = _tmp60_;
 #line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+			crop.top = _tmp60_;
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = crop;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = _tmp61_.right;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = crop;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = _tmp63_.left;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = pixbuf;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.right = _tmp68_;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp69_ = crop;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = _tmp69_.bottom;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp71_ = crop;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = _tmp71_.top;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = pixbuf;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = gdk_pixbuf_get_height (_tmp73_);
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = _tmp74_;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1);
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
-			crop.bottom = _tmp76_;
 #line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+			crop.bottom = _tmp76_;
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = pixbuf;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = _tmp78_.left;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _tmp80_.top;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = box_get_width (&crop);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83_ = box_get_height (&crop);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp84_;
-#line 25239 "Photo.c"
+#line 25254 "Photo.c"
 		}
 	}
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = exceptions;
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_) {
-#line 25248 "Photo.c"
+#line 25263 "Photo.c"
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkPixbuf* _tmp88_ = NULL;
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = pixbuf;
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_);
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp88_;
-#line 25259 "Photo.c"
+#line 25274 "Photo.c"
 	}
-#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = is_scaled;
-#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp89_) {
-#line 25265 "Photo.c"
+#line 25280 "Photo.c"
 		GdkPixbuf* _tmp90_ = NULL;
 		Dimensions _tmp91_ = {0};
 		gint _tmp92_ = 0;
 		Dimensions _tmp93_ = {0};
 		gint _tmp94_ = 0;
 		GdkPixbuf* _tmp95_ = NULL;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = pixbuf;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = scaled_to_viewport;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp92_ = _tmp91_.width;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = scaled_to_viewport;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = _tmp93_.height;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR);
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp95_;
-#line 25288 "Photo.c"
+#line 25303 "Photo.c"
 	}
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp97_) {
-#line 25296 "Photo.c"
+#line 25311 "Photo.c"
 		PixelTransformer* _tmp98_ = NULL;
-#line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
-#line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25302 "Photo.c"
+#line 25317 "Photo.c"
 			PixelTransformer* _tmp99_ = NULL;
 			GdkPixbuf* _tmp100_ = NULL;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp99_ = transformer;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp100_ = pixbuf;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25311 "Photo.c"
+#line 25326 "Photo.c"
 		}
 	}
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = is_scaled;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp102_) {
-#line 25318 "Photo.c"
+#line 25333 "Photo.c"
 		gboolean _tmp103_ = FALSE;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25324 "Photo.c"
+#line 25339 "Photo.c"
 	} else {
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25328 "Photo.c"
+#line 25343 "Photo.c"
 	}
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25332 "Photo.c"
+#line 25347 "Photo.c"
 		GdkPixbuf* _tmp104_ = NULL;
 		Dimensions _tmp105_ = {0};
 		gboolean _tmp106_ = FALSE;
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = pixbuf;
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp104_, &_tmp105_);
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25344 "Photo.c"
+#line 25359 "Photo.c"
 	}
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (transformer);
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = (g_free (redeye_instances), NULL);
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 25354 "Photo.c"
+#line 25369 "Photo.c"
 }
 
 
 static gboolean photo_real_has_user_generated_metadata (Photo* self) {
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return FALSE;
-#line 25363 "Photo.c"
+#line 25378 "Photo.c"
 }
 
 
 gboolean photo_has_user_generated_metadata (Photo* self) {
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25372 "Photo.c"
+#line 25387 "Photo.c"
 }
 
 
 static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 25381 "Photo.c"
+#line 25396 "Photo.c"
 }
 
 
 void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25390 "Photo.c"
+#line 25405 "Photo.c"
 }
 
 
 gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	gchar* result = NULL;
 	PhotoFileFormat* _tmp0_ = NULL;
-#line 3546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25403 "Photo.c"
+#line 25418 "Photo.c"
 		PhotoFileFormat* _tmp1_ = NULL;
 		PhotoFileFormatProperties* _tmp2_ = NULL;
 		PhotoFileFormatProperties* _tmp3_ = NULL;
@@ -25411,45 +25426,45 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		GFile* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = file_format;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_file_format_get_properties (*_tmp1_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_file_get_basename (_tmp7_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp3_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp9_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25441 "Photo.c"
+#line 25456 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp10_ = 0;
 		gboolean _tmp11_ = FALSE;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = photo_get_file_format (self);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25451 "Photo.c"
+#line 25466 "Photo.c"
 			PhotoFileFormat _tmp12_ = 0;
 			PhotoFileFormatProperties* _tmp13_ = NULL;
 			PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -25459,35 +25474,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_get_file_format (self);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_file_format_get_properties (_tmp12_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = _tmp17_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = g_file_get_basename (_tmp18_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp18_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp16_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp14_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp20_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25489 "Photo.c"
+#line 25504 "Photo.c"
 		} else {
 			PhotoFileFormat _tmp21_ = 0;
 			PhotoFileFormatProperties* _tmp22_ = NULL;
@@ -25498,35 +25513,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp27_ = NULL;
 			gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_file_format_get_system_default_format ();
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_file_format_get_properties (_tmp21_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = _tmp22_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = _tmp24_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = g_file_get_basename (_tmp27_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp27_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp25_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp23_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp29_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25528 "Photo.c"
+#line 25543 "Photo.c"
 		}
 	}
 }
@@ -25580,465 +25595,465 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	PhotoFileMetadataWriter* _tmp97_ = NULL;
 	PhotoMetadata* _tmp98_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 	export_reader = NULL;
-#line 3564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_master = TRUE;
-#line 25590 "Photo.c"
+#line 25605 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25597 "Photo.c"
+#line 25612 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25608 "Photo.c"
+#line 25623 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				PhotoFileFormat _tmp6_ = 0;
 				gboolean _tmp7_ = FALSE;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 25623 "Photo.c"
+#line 25638 "Photo.c"
 			} else {
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25627 "Photo.c"
+#line 25642 "Photo.c"
 			}
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25631 "Photo.c"
+#line 25646 "Photo.c"
 				PhotoBackingReaders* _tmp8_ = NULL;
 				PhotoFileReader* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->priv->readers;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_->editable;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _photo_file_adapter_ref0 (_tmp9_);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (export_reader);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				export_reader = _tmp10_;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_master = FALSE;
-#line 25647 "Photo.c"
+#line 25662 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				PhotoBackingReaders* _tmp12_ = NULL;
 				PhotoFileReader* _tmp13_ = NULL;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->priv->readers;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->developer;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25658 "Photo.c"
+#line 25673 "Photo.c"
 					PhotoBackingReaders* _tmp14_ = NULL;
 					PhotoFileReader* _tmp15_ = NULL;
 					PhotoFileFormat _tmp16_ = 0;
 					gboolean _tmp17_ = FALSE;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->priv->readers;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->developer;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp17_;
-#line 25673 "Photo.c"
+#line 25688 "Photo.c"
 				} else {
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25677 "Photo.c"
+#line 25692 "Photo.c"
 				}
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25681 "Photo.c"
+#line 25696 "Photo.c"
 					PhotoBackingReaders* _tmp18_ = NULL;
 					PhotoFileReader* _tmp19_ = NULL;
 					PhotoFileReader* _tmp20_ = NULL;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->readers;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _tmp18_->developer;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _photo_file_adapter_ref0 (_tmp19_);
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (export_reader);
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					export_reader = _tmp20_;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_master = FALSE;
-#line 25697 "Photo.c"
+#line 25712 "Photo.c"
 				} else {
 					PhotoBackingReaders* _tmp21_ = NULL;
 					PhotoFileReader* _tmp22_ = NULL;
 					PhotoFileFormat _tmp23_ = 0;
 					gboolean _tmp24_ = FALSE;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = self->priv->readers;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->master;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp24_) {
-#line 25713 "Photo.c"
+#line 25728 "Photo.c"
 						PhotoBackingReaders* _tmp25_ = NULL;
 						PhotoFileReader* _tmp26_ = NULL;
 						PhotoFileReader* _tmp27_ = NULL;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->readers;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = _tmp25_->master;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _photo_file_adapter_ref0 (_tmp26_);
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_file_adapter_unref0 (export_reader);
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						export_reader = _tmp27_;
-#line 25727 "Photo.c"
+#line 25742 "Photo.c"
 					}
 				}
 			}
 		}
-		__finally384:
+		__finally385:
 		{
 			PhotoBackingReaders* _tmp28_ = NULL;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = self->priv->readers;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25739 "Photo.c"
+#line 25754 "Photo.c"
 		}
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (export_reader);
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 25749 "Photo.c"
+#line 25764 "Photo.c"
 		}
 	}
-#line 3577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = export_reader;
-#line 3577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ == NULL) {
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25762 "Photo.c"
+#line 25777 "Photo.c"
 	}
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = export_reader;
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_file_format_get_properties (_tmp31_);
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	format_properties = _tmp32_;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = format_properties;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = file;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_file_format_properties_convert_file_extension (_tmp33_, _tmp34_);
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	dest_file = _tmp35_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = export_reader;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = dest_file;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = g_file_get_path (_tmp38_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = photo_file_format_create_metadata_writer (_tmp37_, _tmp40_, &_inner_error_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp40_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp42_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25810 "Photo.c"
+#line 25825 "Photo.c"
 	}
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = writer;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3589: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_);
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_);
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp47_);
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp44_);
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp44_);
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = export_reader;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = _tmp49_;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = dest_file;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_copy (_tmp50_, _tmp51_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp50_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25854 "Photo.c"
+#line 25869 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = photo_has_alterations (self);
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp57_) {
-#line 25860 "Photo.c"
+#line 25875 "Photo.c"
 		gboolean _tmp58_ = FALSE;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = is_master;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = _tmp58_;
-#line 25866 "Photo.c"
+#line 25881 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = FALSE;
-#line 25870 "Photo.c"
+#line 25885 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp56_) {
-#line 25874 "Photo.c"
+#line 25889 "Photo.c"
 		gboolean _tmp59_ = FALSE;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = photo_has_user_generated_metadata (self);
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = !_tmp59_;
-#line 25880 "Photo.c"
+#line 25895 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = FALSE;
-#line 25884 "Photo.c"
+#line 25899 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 25888 "Photo.c"
+#line 25903 "Photo.c"
 		gchar* _tmp60_ = NULL;
 		gchar* _tmp61_ = NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = _tmp61_ == NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 25899 "Photo.c"
+#line 25914 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = FALSE;
-#line 25903 "Photo.c"
+#line 25918 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp54_) {
-#line 25907 "Photo.c"
+#line 25922 "Photo.c"
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = _tmp62_;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp63_ == NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp63_);
-#line 25918 "Photo.c"
+#line 25933 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 25922 "Photo.c"
+#line 25937 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 25926 "Photo.c"
+#line 25941 "Photo.c"
 		gboolean _tmp64_ = FALSE;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = export_metadata;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = _tmp64_;
-#line 25932 "Photo.c"
+#line 25947 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = FALSE;
-#line 25936 "Photo.c"
+#line 25951 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp52_) {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp52_) {
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25952 "Photo.c"
+#line 25967 "Photo.c"
 	}
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = export_reader;
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp66_ = photo_file_reader_read_metadata (_tmp65_, &_inner_error_);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp66_;
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25974 "Photo.c"
+#line 25989 "Photo.c"
 	}
-#line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = metadata;
-#line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ == NULL) {
-#line 25980 "Photo.c"
+#line 25995 "Photo.c"
 		PhotoFileReader* _tmp68_ = NULL;
 		PhotoFileFormat _tmp69_ = 0;
 		PhotoMetadata* _tmp70_ = NULL;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = export_reader;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = photo_file_format_create_metadata (_tmp69_);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp70_;
-#line 25994 "Photo.c"
+#line 26009 "Photo.c"
 	}
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp71_ = writer;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp73_ = _tmp72_;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3605: Updating metadata of %s", _tmp73_);
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp73_);
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+	g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp73_);
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp73_);
+#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp74_ != ((time_t) 0)) {
-#line 26010 "Photo.c"
+#line 26025 "Photo.c"
 		PhotoMetadata* _tmp75_ = NULL;
 		time_t _tmp76_ = 0;
 		MetadataDateTime* _tmp77_ = NULL;
 		MetadataDateTime* _tmp78_ = NULL;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = metadata;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = metadata_date_time_new (_tmp76_);
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = _tmp77_;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (_tmp78_);
-#line 26027 "Photo.c"
+#line 26042 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp79_ = NULL;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = metadata;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26034 "Photo.c"
+#line 26049 "Photo.c"
 	}
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp80_ = export_metadata;
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp80_) {
-#line 26040 "Photo.c"
+#line 26055 "Photo.c"
 		PhotoMetadata* _tmp81_ = NULL;
 		gchar* _tmp82_ = NULL;
 		gchar* _tmp83_ = NULL;
@@ -26053,108 +26068,108 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		Orientation _tmp92_ = 0;
 		Orientation _tmp93_ = 0;
 		PhotoMetadata* _tmp95_ = NULL;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = metadata;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = _tmp82_;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp81_, _tmp83_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp83_);
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = metadata;
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = _tmp85_;
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp86_);
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = metadata;
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp88_);
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp87_, &_tmp88_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = metadata;
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = photo_get_orientation (self);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp89_, _tmp90_);
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = metadata;
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
 #line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp92_ = photo_get_orientation (self);
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = photo_get_original_orientation (self);
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp92_ != _tmp93_) {
-#line 26097 "Photo.c"
+#line 26112 "Photo.c"
 			PhotoMetadata* _tmp94_ = NULL;
-#line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = metadata;
-#line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_remove_exif_thumbnail (_tmp94_);
-#line 26103 "Photo.c"
+#line 26118 "Photo.c"
 		}
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = metadata;
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_user_metadata_for_export (self, _tmp95_);
-#line 26109 "Photo.c"
+#line 26124 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp96_ = NULL;
-#line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = metadata;
-#line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp96_);
-#line 26116 "Photo.c"
+#line 26131 "Photo.c"
 	}
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = writer;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp98_ = metadata;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp97_, _tmp98_, &_inner_error_);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 26140 "Photo.c"
+#line 26155 "Photo.c"
 	}
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dest_file);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_format_properties_unref0 (format_properties);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (export_reader);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26156 "Photo.c"
+#line 26171 "Photo.c"
 }
 
 
@@ -26164,59 +26179,59 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = scaling_is_unscaled (scaling);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26176 "Photo.c"
+#line 26191 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_has_alterations (self);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp4_;
-#line 26183 "Photo.c"
+#line 26198 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = TRUE;
-#line 26189 "Photo.c"
+#line 26204 "Photo.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_has_user_generated_metadata (self);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp5_;
-#line 26196 "Photo.c"
+#line 26211 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 26202 "Photo.c"
+#line 26217 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp6_ = 0;
 		PhotoFileFormat _tmp7_ = 0;
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = export_format;
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo_get_file_format (self);
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26212 "Photo.c"
+#line 26227 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26218 "Photo.c"
+#line 26233 "Photo.c"
 }
 
 
@@ -26268,342 +26283,342 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	PhotoFileMetadataWriter* _tmp94_ = NULL;
 	PhotoMetadata* _tmp95_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (scaling != NULL);
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (scaling != NULL);
+#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = direct_copy_unmodified;
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 26280 "Photo.c"
+#line 26295 "Photo.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = dest_file;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_file_copy (_tmp2_, _tmp3_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp2_);
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26300 "Photo.c"
+#line 26315 "Photo.c"
 		}
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26304 "Photo.c"
+#line 26319 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = scaling_is_unscaled (scaling);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 26310 "Photo.c"
+#line 26325 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = photo_has_alterations (self);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp9_) {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26319 "Photo.c"
+#line 26334 "Photo.c"
 		} else {
 			gboolean _tmp10_ = FALSE;
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_only_metadata_changed (self);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp10_;
-#line 26326 "Photo.c"
+#line 26341 "Photo.c"
 		}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26330 "Photo.c"
+#line 26345 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26334 "Photo.c"
+#line 26349 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26338 "Photo.c"
+#line 26353 "Photo.c"
 		PhotoFileFormat _tmp11_ = 0;
 		PhotoFileFormat _tmp12_ = 0;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = export_format;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_get_file_format (self);
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26347 "Photo.c"
+#line 26362 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26351 "Photo.c"
+#line 26366 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26355 "Photo.c"
+#line 26370 "Photo.c"
 		PhotoFileFormat _tmp13_ = 0;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_file_format (self);
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26361 "Photo.c"
+#line 26376 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26365 "Photo.c"
+#line 26380 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26369 "Photo.c"
+#line 26384 "Photo.c"
 		gboolean _tmp14_ = FALSE;
 		GFile* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = dest_file;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = export_metadata;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp17_;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26388 "Photo.c"
+#line 26403 "Photo.c"
 		}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26394 "Photo.c"
+#line 26409 "Photo.c"
 		}
 	}
-#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp18_;
-#line 3667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = metadata;
-#line 3667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ == NULL) {
-#line 26405 "Photo.c"
+#line 26420 "Photo.c"
 		PhotoFileFormat _tmp20_ = 0;
 		PhotoMetadata* _tmp21_ = NULL;
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = export_format;
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_create_metadata (_tmp20_);
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp21_;
-#line 26416 "Photo.c"
+#line 26431 "Photo.c"
 	}
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_file_format_can_write (_tmp22_);
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp23_) {
-#line 26424 "Photo.c"
+#line 26439 "Photo.c"
 		PhotoFileFormat _tmp24_ = 0;
-#line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = photo_file_format_get_system_default_format ();
-#line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		export_format = _tmp24_;
-#line 26430 "Photo.c"
+#line 26445 "Photo.c"
 	}
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dest_file;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_file_get_path (_tmp26_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp28_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp30_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26456 "Photo.c"
+#line 26471 "Photo.c"
 	}
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = writer;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = export_format;
-#line 3676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3675: Saving transformed version of %s to %s in file format" \
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3677: Saving transformed version of %s to %s in file format" \
 " %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp35_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp32_);
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = photo_get_file_format (self);
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = TRUE;
-#line 26484 "Photo.c"
+#line 26499 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp40_ = 0;
-#line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = photo_get_file_format (self);
-#line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26491 "Photo.c"
+#line 26506 "Photo.c"
 	}
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26495 "Photo.c"
+#line 26510 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
 		Scaling _tmp42_ = {0};
 		GdkPixbuf* _tmp43_ = NULL;
 		GdkPixbuf* _tmp44_ = NULL;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = *scaling;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = photo_get_pixbuf_with_options (self, &_tmp42_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp43_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26518 "Photo.c"
+#line 26533 "Photo.c"
 		}
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = NULL;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp44_;
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp41_);
-#line 26530 "Photo.c"
+#line 26545 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
 		Scaling _tmp46_ = {0};
 		GdkPixbuf* _tmp47_ = NULL;
 		GdkPixbuf* _tmp48_ = NULL;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = *scaling;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = photo_get_pixbuf_with_options (self, &_tmp46_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = _tmp47_;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26554 "Photo.c"
+#line 26569 "Photo.c"
 		}
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = NULL;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp48_;
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp45_);
-#line 26566 "Photo.c"
+#line 26581 "Photo.c"
 	}
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = pixbuf;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = quality;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26588 "Photo.c"
+#line 26603 "Photo.c"
 	}
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _tmp53_;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3694: Setting EXIF for %s", _tmp54_);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3696: Setting EXIF for %s", _tmp54_);
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp54_);
-#line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = export_metadata;
-#line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 26604 "Photo.c"
+#line 26619 "Photo.c"
 		PhotoMetadata* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -26616,213 +26631,213 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		PhotoMetadata* _tmp70_ = NULL;
 		PhotoMetadata* _tmp71_ = NULL;
 		gboolean _tmp72_ = FALSE;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = metadata;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp58_);
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = metadata;
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = metadata;
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
 #line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp63_ != ((time_t) 0)) {
-#line 26645 "Photo.c"
+#line 26660 "Photo.c"
 			PhotoMetadata* _tmp64_ = NULL;
 			time_t _tmp65_ = 0;
 			MetadataDateTime* _tmp66_ = NULL;
 			MetadataDateTime* _tmp67_ = NULL;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = metadata;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = metadata_date_time_new (_tmp65_);
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (_tmp67_);
-#line 26662 "Photo.c"
+#line 26677 "Photo.c"
 		} else {
 			PhotoMetadata* _tmp68_ = NULL;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = metadata;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26669 "Photo.c"
+#line 26684 "Photo.c"
 		}
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth");
-#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = metadata;
-#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight");
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = metadata;
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_remove_exif_thumbnail (_tmp71_);
 #line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_metadata_remove_exif_thumbnail (_tmp71_);
+#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = photo_has_user_generated_metadata (self);
-#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp72_) {
-#line 26687 "Photo.c"
+#line 26702 "Photo.c"
 			PhotoMetadata* _tmp73_ = NULL;
-#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata;
-#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26693 "Photo.c"
+#line 26708 "Photo.c"
 		}
 	} else {
 		PhotoMetadata* _tmp74_ = NULL;
-#line 3717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = metadata;
-#line 3717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26701 "Photo.c"
+#line 26716 "Photo.c"
 	}
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = TRUE;
-#line 26709 "Photo.c"
+#line 26724 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp77_ = 0;
-#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = photo_get_file_format (self);
-#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26716 "Photo.c"
+#line 26731 "Photo.c"
 	}
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26720 "Photo.c"
+#line 26735 "Photo.c"
 		PhotoMetadata* _tmp78_ = NULL;
 		Dimensions _tmp79_ = {0};
 		PhotoMetadata* _tmp80_ = NULL;
 		Orientation _tmp81_ = 0;
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = metadata;
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp79_);
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = metadata;
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = photo_get_orientation (self);
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26737 "Photo.c"
+#line 26752 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp82_ = NULL;
 		GdkPixbuf* _tmp83_ = NULL;
 		Dimensions _tmp84_ = {0};
 		PhotoMetadata* _tmp85_ = NULL;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = metadata;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = pixbuf;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp83_, &_tmp84_);
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = metadata;
-#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26755 "Photo.c"
+#line 26770 "Photo.c"
 	}
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = dest_file;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = g_file_get_path (_tmp88_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp90_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = _tmp92_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26785 "Photo.c"
+#line 26800 "Photo.c"
 	}
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp86_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = NULL;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = _tmp93_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = metadata;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp94_, _tmp95_, &_inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp94_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp86_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26813 "Photo.c"
+#line 26828 "Photo.c"
 	}
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 26823 "Photo.c"
+#line 26838 "Photo.c"
 }
 
 
@@ -26854,214 +26869,214 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	GFile* _tmp31_ = NULL;
 	GFile* _tmp32_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26857 "Photo.c"
+#line 26872 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26864 "Photo.c"
+#line 26879 "Photo.c"
 		{
 			PhotoFileFormat _tmp1_ = 0;
 			GFile* _tmp2_ = NULL;
-#line 3740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_file_format (self);
-#line 3740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_file_format = _tmp1_;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp2_;
-#line 26878 "Photo.c"
+#line 26893 "Photo.c"
 		}
-		__finally385:
+		__finally386:
 		{
 			PhotoRow* _tmp3_ = NULL;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26887 "Photo.c"
+#line 26902 "Photo.c"
 		}
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 26897 "Photo.c"
+#line 26912 "Photo.c"
 		}
 	}
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _vala_file_format;
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_file_format_can_write (_tmp4_);
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 26906 "Photo.c"
+#line 26921 "Photo.c"
 		PhotoFileFormat _tmp6_ = 0;
-#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_get_system_default_format ();
-#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_file_format = _tmp6_;
-#line 26912 "Photo.c"
+#line 26927 "Photo.c"
 	}
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp9_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp10_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp8_);
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp8_);
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = ext;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ == NULL) {
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 26936 "Photo.c"
+#line 26951 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp13_ = 0;
 		PhotoFileFormatProperties* _tmp14_ = NULL;
 		PhotoFileFormatProperties* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_file_format;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = photo_file_format_get_properties (_tmp13_);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = ext;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = !_tmp17_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp15_);
-#line 26957 "Photo.c"
+#line 26972 "Photo.c"
 	}
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 26961 "Photo.c"
+#line 26976 "Photo.c"
 		PhotoFileFormat _tmp18_ = 0;
 		PhotoFileFormatProperties* _tmp19_ = NULL;
 		PhotoFileFormatProperties* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _vala_file_format;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_format_get_properties (_tmp18_);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		ext = _tmp21_;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp20_);
-#line 26980 "Photo.c"
+#line 26995 "Photo.c"
 	}
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _ ("modified");
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = ext;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _tmp23_, _tmp24_);
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_basename = _tmp25_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_file_get_parent (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = generate_unique_file (_tmp28_, editable_basename, &_tmp29_, &_inner_error_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	collision = _tmp29_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp28_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp31_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (editable_basename);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 27020 "Photo.c"
+#line 27035 "Photo.c"
 	}
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp26_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = NULL;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp32_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp26_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (editable_basename);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (file_format) {
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		*file_format = _vala_file_format;
-#line 27042 "Photo.c"
+#line 27057 "Photo.c"
 	}
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27046 "Photo.c"
+#line 27061 "Photo.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27053 "Photo.c"
+#line 27068 "Photo.c"
 }
 
 
 static void _g_list_free__g_object_unref0_ (GList* self) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_free (self);
-#line 27062 "Photo.c"
+#line 27077 "Photo.c"
 }
 
 
@@ -27099,260 +27114,260 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	GPid _tmp33_ = 0;
 	gboolean _tmp34_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27106 "Photo.c"
+#line 27121 "Photo.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27122 "Photo.c"
+#line 27137 "Photo.c"
 	} else {
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = config_facade_get_instance ();
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp7_;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 27139 "Photo.c"
+#line 27154 "Photo.c"
 	}
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	commandline = _tmp8_;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = commandline;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = is_string_empty (_tmp9_);
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27159 "Photo.c"
+#line 27174 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		GAppInfo* _tmp13_ = NULL;
 		GAppInfo* _tmp14_ = NULL;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = commandline;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_);
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp13_;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27174 "Photo.c"
-			goto __catch386_g_error;
+#line 27189 "Photo.c"
+			goto __catch387_g_error;
 		}
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = NULL;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = _tmp14_;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp11_);
-#line 27187 "Photo.c"
+#line 27202 "Photo.c"
 	}
-	goto __finally386;
-	__catch386_g_error:
+	goto __finally387;
+	__catch387_g_error:
 	{
 		GError* er = NULL;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		er = _inner_error_;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = NULL;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (er);
-#line 27203 "Photo.c"
+#line 27218 "Photo.c"
 	}
-	__finally386:
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally387:
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27218 "Photo.c"
+#line 27233 "Photo.c"
 	}
-#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = file;
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
-	files = g_list_insert (files, _tmp16_, -1);
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+	files = g_list_insert (files, _tmp16_, -1);
+#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = app;
-#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 27232 "Photo.c"
+#line 27247 "Photo.c"
 		gboolean _tmp18_ = FALSE;
 		GAppInfo* _tmp19_ = NULL;
 		GList* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = app;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = files;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_app_info_launch (_tmp19_, _tmp20_, NULL, &_inner_error_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp21_;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			__g_list_free__g_object_unref0_0 (files);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (app);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (commandline);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp0_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 27259 "Photo.c"
+#line 27274 "Photo.c"
 		}
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp18_;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27273 "Photo.c"
+#line 27288 "Photo.c"
 	}
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = g_new0 (gchar*, 2 + 1);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = _tmp22_;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv_length1 = 2;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_argv_size_ = argv_length1;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = argv;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23__length1 = argv_length1;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = commandline;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = g_strdup (_tmp24_);
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp23_[0]);
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_[0] = _tmp25_;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp23_[0];
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = argv;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27__length1 = argv_length1;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = file;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = g_file_get_path (_tmp28_);
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp27_[1]);
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_[1] = _tmp29_;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp27_[1];
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = argv;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32__length1 = argv_length1;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = g_spawn_async ("/", _tmp32_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp33_, &_inner_error_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	child_pid = _tmp33_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp34_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27337 "Photo.c"
+#line 27352 "Photo.c"
 	}
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp31_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	__g_list_free__g_object_unref0_0 (files);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (app);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (commandline);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27353 "Photo.c"
+#line 27368 "Photo.c"
 }
 
 
@@ -27361,25 +27376,25 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
 	GFile* _tmp1_ = NULL;
 	PhotoFileFormat _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 3796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_get_master_file_format (self);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27380 "Photo.c"
+#line 27395 "Photo.c"
 	}
 }
 
@@ -27398,248 +27413,248 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	GFile* _tmp47_ = NULL;
 	PhotoFileFormat _tmp48_ = 0;
 	GError * _inner_error_ = NULL;
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3804 "/home/jens/Source/shotwell/src/Photo.vala"
 	current_editable_file = NULL;
-#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 	create_editable_file = NULL;
-#line 27405 "Photo.c"
+#line 27420 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27412 "Photo.c"
+#line 27427 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			GFile* _tmp6_ = NULL;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27423 "Photo.c"
+#line 27438 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				current_editable_file = _tmp5_;
-#line 27437 "Photo.c"
+#line 27452 "Photo.c"
 			}
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = current_editable_file;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ == NULL) {
-#line 27443 "Photo.c"
+#line 27458 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_);
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp8_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp9_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27456 "Photo.c"
-					goto __finally387;
+#line 27471 "Photo.c"
+					goto __finally388;
 				}
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = NULL;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				create_editable_file = _tmp10_;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp7_);
-#line 27469 "Photo.c"
+#line 27484 "Photo.c"
 			} else {
 				PhotoBackingReaders* _tmp11_ = NULL;
 				PhotoFileReader* _tmp12_ = NULL;
 				PhotoFileFormat _tmp13_ = 0;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->readers;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->editable;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp13_;
-#line 27482 "Photo.c"
+#line 27497 "Photo.c"
 			}
 		}
-		__finally387:
+		__finally388:
 		{
 			PhotoBackingReaders* _tmp14_ = NULL;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->priv->readers;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27492 "Photo.c"
+#line 27507 "Photo.c"
 		}
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27504 "Photo.c"
+#line 27519 "Photo.c"
 		}
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = create_editable_file;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 27511 "Photo.c"
+#line 27526 "Photo.c"
 		GFile* _tmp18_ = NULL;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = current_editable_file;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp18_ != NULL;
-#line 27517 "Photo.c"
+#line 27532 "Photo.c"
 	} else {
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27521 "Photo.c"
+#line 27536 "Photo.c"
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27525 "Photo.c"
+#line 27540 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GFile* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = current_editable_file;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_file_query_exists (_tmp20_, NULL);
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp21_) {
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27537 "Photo.c"
+#line 27552 "Photo.c"
 		} else {
 			gboolean _tmp22_ = FALSE;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_has_transformations (self);
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp22_;
-#line 27544 "Photo.c"
+#line 27559 "Photo.c"
 		}
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27548 "Photo.c"
+#line 27563 "Photo.c"
 	} else {
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27552 "Photo.c"
+#line 27567 "Photo.c"
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27556 "Photo.c"
+#line 27571 "Photo.c"
 		GFile* _tmp23_ = NULL;
 		GFile* _tmp24_ = NULL;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = current_editable_file;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		create_editable_file = _tmp24_;
-#line 27567 "Photo.c"
+#line 27582 "Photo.c"
 	}
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = create_editable_file;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != NULL) {
-#line 27573 "Photo.c"
+#line 27588 "Photo.c"
 		PhotoFileFormat _tmp27_ = 0;
 		gboolean _tmp28_ = FALSE;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = editable_file_format;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27582 "Photo.c"
+#line 27597 "Photo.c"
 	} else {
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27586 "Photo.c"
+#line 27601 "Photo.c"
 	}
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27590 "Photo.c"
+#line 27605 "Photo.c"
 		PhotoFileFormat _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
-#line 3823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27597 "Photo.c"
+#line 27612 "Photo.c"
 		{
 			GFile* _tmp29_ = NULL;
 			Scaling _tmp30_ = {0};
 			PhotoFileFormat _tmp31_ = 0;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = create_editable_file;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_for_original (&_tmp30_);
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = editable_file_format;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27612 "Photo.c"
-				goto __catch388_g_error;
+#line 27627 "Photo.c"
+				goto __catch389_g_error;
 			}
 		}
-		goto __finally388;
-		__catch388_g_error:
+		goto __finally389;
+		__catch389_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp38_ = NULL;
 			GError* _tmp39_ = NULL;
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27626 "Photo.c"
+#line 27641 "Photo.c"
 			{
 				GFile* _tmp32_ = NULL;
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = create_editable_file;
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27635 "Photo.c"
-					goto __catch389_g_error;
+#line 27650 "Photo.c"
+					goto __catch390_g_error;
 				}
 			}
-			goto __finally389;
-			__catch389_g_error:
+			goto __finally390;
+			__catch390_g_error:
 			{
 				GError* delete_err = NULL;
 				GFile* _tmp33_ = NULL;
@@ -27647,169 +27662,169 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				gchar* _tmp35_ = NULL;
 				GError* _tmp36_ = NULL;
 				const gchar* _tmp37_ = NULL;
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				delete_err = _inner_error_;
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = create_editable_file;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = g_file_get_path (_tmp33_);
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = delete_err;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_->message;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:3834: Unable to delete editable file %s after export error:" \
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:3836: Unable to delete editable file %s after export error:" \
 " %s", _tmp35_, _tmp37_);
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp35_);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (delete_err);
-#line 27668 "Photo.c"
+#line 27683 "Photo.c"
 			}
-			__finally389:
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally390:
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 27687 "Photo.c"
+#line 27702 "Photo.c"
 			}
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _g_error_copy0 (_tmp38_);
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = _tmp39_;
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 27697 "Photo.c"
-			goto __finally388;
+#line 27712 "Photo.c"
+			goto __finally389;
 		}
-		__finally388:
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally389:
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27711 "Photo.c"
+#line 27726 "Photo.c"
 		}
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = create_editable_file;
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27729 "Photo.c"
+#line 27744 "Photo.c"
 		}
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		current_editable_file = _tmp43_;
-#line 27739 "Photo.c"
+#line 27754 "Photo.c"
 	}
-#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
-#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp44_ != NULL, "current_editable_file != null");
-#line 3850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = self->priv->editable_monitor;
-#line 3850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_ == NULL) {
-#line 27749 "Photo.c"
+#line 27764 "Photo.c"
 		GFile* _tmp46_ = NULL;
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_start_monitoring_editable (self, _tmp46_, &_inner_error_);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27765 "Photo.c"
+#line 27780 "Photo.c"
 		}
 	}
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = current_editable_file;
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = photo_get_file_format (self);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27784 "Photo.c"
+#line 27799 "Photo.c"
 	}
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (create_editable_file);
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (current_editable_file);
-#line 27790 "Photo.c"
+#line 27805 "Photo.c"
 }
 
 
 void photo_revert_to_master (Photo* self, gboolean notify) {
 	gboolean _tmp0_ = FALSE;
-#line 3856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3858 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = notify;
-#line 3857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27802 "Photo.c"
+#line 27817 "Photo.c"
 }
 
 
 static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
-#line 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27809 "Photo.c"
+#line 27824 "Photo.c"
 }
 
 
@@ -27821,45 +27836,45 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 	GFileMonitor* _tmp4_ = NULL;
 	GFileMonitor* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_halt_monitoring_editable (self);
-#line 3864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 3864 "/home/jens/Source/shotwell/src/Photo.vala"
-	library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable");
 #line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+	library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable");
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp3_;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27843 "Photo.c"
+#line 27858 "Photo.c"
 	}
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = NULL;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = _tmp4_;
-#line 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = self->priv->editable_monitor;
-#line 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0);
-#line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 27859 "Photo.c"
+#line 27874 "Photo.c"
 }
 
 
@@ -27871,49 +27886,49 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	GFileMonitor* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	GFileMonitor* _tmp6_ = NULL;
-#line 3870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_monitor;
-#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27879 "Photo.c"
+#line 27894 "Photo.c"
 	}
-#line 3875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
-#line 3875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp1_;
-#line 3876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 3876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 27889 "Photo.c"
+#line 27904 "Photo.c"
 		GFile* _tmp3_ = NULL;
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp3_);
-#line 27895 "Photo.c"
+#line 27910 "Photo.c"
 	}
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp5_, NULL, FALSE);
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self);
-#line 3880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->editable_monitor;
-#line 3880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_monitor_cancel (_tmp6_);
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = NULL;
-#line 3870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 27913 "Photo.c"
+#line 27928 "Photo.c"
 }
 
 
@@ -27925,174 +27940,174 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
 	PhotoFileReader* _tmp4_ = NULL;
 	PhotoFileReader* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3891 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, FALSE);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, _tmp5_, &_inner_error_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp3_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27955 "Photo.c"
+#line 27970 "Photo.c"
 	}
 }
 
 
 static void photo_update_editable_attributes (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3895 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, TRUE, NULL, &_inner_error_);
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27972 "Photo.c"
+#line 27987 "Photo.c"
 	}
 }
 
 
 void photo_reimport_editable (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3899 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, NULL, &_inner_error_);
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27989 "Photo.c"
+#line 28004 "Photo.c"
 	}
 }
 
 
 static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28001 "Photo.c"
+#line 28016 "Photo.c"
 	}
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28007 "Photo.c"
+#line 28022 "Photo.c"
 }
 
 
 static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28018 "Photo.c"
+#line 28033 "Photo.c"
 	}
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28024 "Photo.c"
+#line 28039 "Photo.c"
 }
 
 
 static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28035 "Photo.c"
+#line 28050 "Photo.c"
 	}
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28041 "Photo.c"
+#line 28056 "Photo.c"
 }
 
 
 static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28052 "Photo.c"
+#line 28067 "Photo.c"
 	}
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28058 "Photo.c"
+#line 28073 "Photo.c"
 }
 
 
 static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28069 "Photo.c"
+#line 28084 "Photo.c"
 	}
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28075 "Photo.c"
+#line 28090 "Photo.c"
 }
 
 
 static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28086 "Photo.c"
+#line 28101 "Photo.c"
 	}
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28092 "Photo.c"
+#line 28107 "Photo.c"
 }
 
 
@@ -28135,168 +28150,168 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	gchar** _tmp131_ = NULL;
 	gint _tmp131__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader));
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader));
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = only_attributes;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 28143 "Photo.c"
+#line 28158 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = new_reader;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 28149 "Photo.c"
+#line 28164 "Photo.c"
 	} else {
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28153 "Photo.c"
+#line 28168 "Photo.c"
 	}
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 28159 "Photo.c"
+#line 28174 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28166 "Photo.c"
+#line 28181 "Photo.c"
 	}
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
+#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_editable_reader (self);
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
-	old_reader = _tmp5_;
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+	old_reader = _tmp5_;
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = new_reader;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp7_;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 28180 "Photo.c"
+#line 28195 "Photo.c"
 		PhotoFileReader* _tmp8_ = NULL;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28186 "Photo.c"
+#line 28201 "Photo.c"
 	}
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp9_;
-#line 3910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = reader;
-#line 3910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ == NULL) {
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_detach_editable (self, FALSE, TRUE, TRUE);
 #line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_detach_editable (self, FALSE, TRUE, TRUE);
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28204 "Photo.c"
+#line 28219 "Photo.c"
 	}
-#line 3916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
-#line 3917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 	filesize_changed = FALSE;
-#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
-	is_new_editable = FALSE;
 #line 3920 "/home/jens/Source/shotwell/src/Photo.vala"
+	is_new_editable = FALSE;
+#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp11_);
-#line 3920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp11_;
-#line 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = reader;
-#line 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp13_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_query_backing_photo_row (self, _tmp14_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp15_, &_inner_error_);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp15_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp16_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28246 "Photo.c"
+#line 28261 "Photo.c"
 	}
-#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = backing_photo_id_is_invalid (&editable_id);
-#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 28252 "Photo.c"
+#line 28267 "Photo.c"
 		BackingPhotoRow* _tmp18_ = NULL;
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28258 "Photo.c"
+#line 28273 "Photo.c"
 			BackingPhotoTable* _tmp19_ = NULL;
 			BackingPhotoTable* _tmp20_ = NULL;
 			BackingPhotoRow* _tmp21_ = NULL;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = backing_photo_table_get_instance ();
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = backing;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp20_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28288 "Photo.c"
+#line 28303 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp22_ = NULL;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28296 "Photo.c"
+#line 28311 "Photo.c"
 				{
 					PhotoTable* _tmp23_ = NULL;
 					PhotoTable* _tmp24_ = NULL;
@@ -28309,91 +28324,91 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp31_ = NULL;
 					BackingPhotoRow* _tmp32_ = NULL;
 					Orientation _tmp33_ = 0;
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3935 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = TRUE;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
-					filesize_changed = TRUE;
 #line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+					filesize_changed = TRUE;
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = photo_table_get_instance ();
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = self->row;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = backing;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp26_->id;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_);
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_database_table_unref0 (_tmp24_);
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28329 "Photo.c"
-						goto __finally390;
+#line 28344 "Photo.c"
+						goto __finally391;
 					}
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _backing_photo_row_ref0 (_tmp28_);
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp29_;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = self->priv->editable;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = _backing_photo_row_ref0 (_tmp30_);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp31_;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = self->backing_photo_row;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = _tmp32_->original_orientation;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp33_);
-#line 28354 "Photo.c"
+#line 28369 "Photo.c"
 				}
-				__finally390:
+				__finally391:
 				{
 					PhotoRow* _tmp34_ = NULL;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = self->row;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28363 "Photo.c"
+#line 28378 "Photo.c"
 				}
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28381 "Photo.c"
+#line 28396 "Photo.c"
 				}
 			}
 		}
-#line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28387 "Photo.c"
+#line 28402 "Photo.c"
 	}
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = only_attributes;
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 28393 "Photo.c"
+#line 28408 "Photo.c"
 		gboolean _tmp36_ = FALSE;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
@@ -28406,155 +28421,155 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		glong _tmp51_ = 0L;
 		GFileInfo* _tmp52_ = NULL;
 		gint64 _tmp53_ = 0LL;
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = backing_photo_id_is_valid (&editable_id);
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28410 "Photo.c"
+#line 28425 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
 			GFileInfo* _tmp39_ = NULL;
 			GFileInfo* _tmp40_ = NULL;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = file;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_);
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp39_;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28424 "Photo.c"
-				goto __catch391_g_error;
+#line 28439 "Photo.c"
+				goto __catch392_g_error;
 			}
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = NULL;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			info = _tmp40_;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp37_);
-#line 28437 "Photo.c"
+#line 28452 "Photo.c"
 		}
-		goto __finally391;
-		__catch391_g_error:
+		goto __finally392;
+		__catch392_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			GError* _tmp43_ = NULL;
 			const gchar* _tmp44_ = NULL;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = err;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_->message;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:3953: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_);
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:3955: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_);
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp42_);
-#line 3954 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_detach_editable (self, FALSE, TRUE, TRUE);
 #line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_detach_editable (self, FALSE, TRUE, TRUE);
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28481 "Photo.c"
+#line 28496 "Photo.c"
 		}
-		__finally391:
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally392:
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28502 "Photo.c"
+#line 28517 "Photo.c"
 		}
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_file_info_get_modification_time (_tmp45_, &_tmp46_);
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
-		timestamp = _tmp46_;
 #line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+		timestamp = _tmp46_;
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = backing_photo_table_get_instance ();
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = editable_id;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = timestamp;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_.tv_sec;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = info;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = g_file_info_get_size (_tmp52_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp48_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28546 "Photo.c"
+#line 28561 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp54_ = NULL;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = self->row;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28554 "Photo.c"
+#line 28569 "Photo.c"
 			{
 				BackingPhotoRow* _tmp55_ = NULL;
 				time_t _tmp56_ = 0;
@@ -28570,145 +28585,145 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				BackingPhotoRow* _tmp66_ = NULL;
 				GFileInfo* _tmp67_ = NULL;
 				gint64 _tmp68_ = 0LL;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = self->priv->editable;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = _tmp55_->timestamp;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = timestamp;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = _tmp57_.tv_sec;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				timestamp_changed = _tmp56_ != ((time_t) _tmp58_);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->editable;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp59_->filesize;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = info;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = g_file_info_get_size (_tmp61_);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
-				filesize_changed = _tmp60_ != _tmp62_;
 #line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+				filesize_changed = _tmp60_ != _tmp62_;
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = self->priv->editable;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = timestamp;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = _tmp64_.tv_sec;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_->timestamp = (time_t) _tmp65_;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = self->priv->editable;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = info;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp68_ = g_file_info_get_size (_tmp67_);
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_->filesize = _tmp68_;
-#line 28606 "Photo.c"
+#line 28621 "Photo.c"
 			}
-			__finally392:
+			__finally393:
 			{
 				PhotoRow* _tmp69_ = NULL;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = self->row;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28615 "Photo.c"
+#line 28630 "Photo.c"
 			}
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (info);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28635 "Photo.c"
+#line 28650 "Photo.c"
 			}
 		}
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28640 "Photo.c"
+#line 28655 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
 		gboolean _tmp71_ = FALSE;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28648 "Photo.c"
+#line 28663 "Photo.c"
 			gboolean _tmp72_ = FALSE;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = is_new_editable;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = !_tmp72_;
-#line 28654 "Photo.c"
+#line 28669 "Photo.c"
 		} else {
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28658 "Photo.c"
+#line 28673 "Photo.c"
 		}
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28662 "Photo.c"
+#line 28677 "Photo.c"
 			BackingPhotoRow* _tmp73_ = NULL;
 			BackingPhotoID _tmp74_ = {0};
 			BackingPhotoTable* _tmp75_ = NULL;
 			BackingPhotoTable* _tmp76_ = NULL;
 			BackingPhotoRow* _tmp77_ = NULL;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = backing;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = editable_id;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_->id = _tmp74_;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = backing_photo_table_get_instance ();
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _tmp75_;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = backing;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp76_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28700 "Photo.c"
+#line 28715 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp78_ = NULL;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = self->row;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28708 "Photo.c"
+#line 28723 "Photo.c"
 				{
 					BackingPhotoRow* _tmp79_ = NULL;
 					time_t _tmp80_ = 0;
@@ -28724,232 +28739,232 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp90_ = NULL;
 					BackingPhotoRow* _tmp91_ = NULL;
 					Orientation _tmp92_ = 0;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp79_ = self->priv->editable;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp80_ = _tmp79_->timestamp;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp81_ = backing;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp82_ = _tmp81_->timestamp;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = _tmp80_ != _tmp82_;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp83_ = self->priv->editable;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp84_ = _tmp83_->filesize;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp85_ = backing;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp86_ = _tmp85_->filesize;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
-					filesize_changed = _tmp84_ != _tmp86_;
 #line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+					filesize_changed = _tmp84_ != _tmp86_;
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = backing;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = _backing_photo_row_ref0 (_tmp87_);
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp88_;
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = self->priv->editable;
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _backing_photo_row_ref0 (_tmp89_);
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp90_;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp91_ = self->backing_photo_row;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_->original_orientation;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp92_);
-#line 28766 "Photo.c"
+#line 28781 "Photo.c"
 				}
-				__finally393:
+				__finally394:
 				{
 					PhotoRow* _tmp93_ = NULL;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = self->row;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28775 "Photo.c"
+#line 28790 "Photo.c"
 				}
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28793 "Photo.c"
+#line 28808 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = new_reader;
-#line 3991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp94_ != NULL) {
-#line 28802 "Photo.c"
+#line 28817 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp95_ = NULL;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->readers;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28809 "Photo.c"
+#line 28824 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp96_ = NULL;
 				PhotoFileReader* _tmp97_ = NULL;
 				PhotoFileReader* _tmp98_ = NULL;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = self->priv->readers;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = new_reader;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = _photo_file_adapter_ref0 (_tmp97_);
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp96_->editable);
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_->editable = _tmp98_;
-#line 28824 "Photo.c"
+#line 28839 "Photo.c"
 			}
-			__finally394:
+			__finally395:
 			{
 				PhotoBackingReaders* _tmp99_ = NULL;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->readers;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28833 "Photo.c"
+#line 28848 "Photo.c"
 			}
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28851 "Photo.c"
+#line 28866 "Photo.c"
 			}
 		}
 	}
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = only_attributes;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp101_) {
-#line 28859 "Photo.c"
+#line 28874 "Photo.c"
 		PhotoFileReader* _tmp102_ = NULL;
 		PhotoFileReader* _tmp103_ = NULL;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = reader;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = old_reader;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28868 "Photo.c"
+#line 28883 "Photo.c"
 	} else {
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28872 "Photo.c"
+#line 28887 "Photo.c"
 	}
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28876 "Photo.c"
+#line 28891 "Photo.c"
 		GFile* _tmp104_ = NULL;
 		PhotoFileReader* _tmp105_ = NULL;
 		GFile* _tmp108_ = NULL;
 		PhotoFileReader* _tmp109_ = NULL;
-#line 3998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = old_reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 28887 "Photo.c"
+#line 28902 "Photo.c"
 			PhotoFileReader* _tmp106_ = NULL;
 			GFile* _tmp107_ = NULL;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp106_ = old_reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = _tmp107_;
-#line 28898 "Photo.c"
+#line 28913 "Photo.c"
 		} else {
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = NULL;
-#line 28904 "Photo.c"
+#line 28919 "Photo.c"
 		}
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = new_reader;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp109_ != NULL) {
-#line 28910 "Photo.c"
+#line 28925 "Photo.c"
 			PhotoFileReader* _tmp110_ = NULL;
 			GFile* _tmp111_ = NULL;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp110_ = new_reader;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp111_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = _tmp111_;
-#line 28921 "Photo.c"
+#line 28936 "Photo.c"
 		} else {
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = NULL;
-#line 28927 "Photo.c"
+#line 28942 "Photo.c"
 		}
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp108_);
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp104_);
-#line 28935 "Photo.c"
+#line 28950 "Photo.c"
 	}
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = _tmp112_;
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list_length1 = 0;
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_list_size_ = alteration_list_length1;
-#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = timestamp_changed;
-#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp113_) {
-#line 28949 "Photo.c"
+#line 28964 "Photo.c"
 		gchar** _tmp114_ = NULL;
 		gint _tmp114__length1 = 0;
 		gchar* _tmp115_ = NULL;
@@ -28957,59 +28972,59 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp116__length1 = 0;
 		gchar* _tmp117_ = NULL;
 		gboolean _tmp118_ = FALSE;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = alteration_list;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114__length1 = alteration_list_length1;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = g_strdup ("metadata:editable-timestamp");
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = alteration_list;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116__length1 = alteration_list_length1;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = g_strdup ("metadata:baseline-timestamp");
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
+#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = photo_is_editable_source (self);
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp118_) {
-#line 28977 "Photo.c"
+#line 28992 "Photo.c"
 			gchar** _tmp119_ = NULL;
 			gint _tmp119__length1 = 0;
 			gchar* _tmp120_ = NULL;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119_ = alteration_list;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119__length1 = alteration_list_length1;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 28989 "Photo.c"
+#line 29004 "Photo.c"
 		}
 	}
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = filesize_changed;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp122_) {
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = TRUE;
-#line 28998 "Photo.c"
+#line 29013 "Photo.c"
 	} else {
 		PhotoFileReader* _tmp123_ = NULL;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = new_reader;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = _tmp123_ != NULL;
-#line 29005 "Photo.c"
+#line 29020 "Photo.c"
 	}
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29009 "Photo.c"
+#line 29024 "Photo.c"
 		gchar** _tmp124_ = NULL;
 		gint _tmp124__length1 = 0;
 		gchar* _tmp125_ = NULL;
@@ -29017,79 +29032,79 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp126__length1 = 0;
 		gchar* _tmp127_ = NULL;
 		gboolean _tmp128_ = FALSE;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124_ = alteration_list;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124__length1 = alteration_list_length1;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp125_ = g_strdup ("image:editable");
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126_ = alteration_list;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126__length1 = alteration_list_length1;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp127_ = g_strdup ("image:baseline");
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp128_ = photo_is_editable_source (self);
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp128_) {
-#line 29037 "Photo.c"
+#line 29052 "Photo.c"
 			gchar** _tmp129_ = NULL;
 			gint _tmp129__length1 = 0;
 			gchar* _tmp130_ = NULL;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129_ = alteration_list;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129__length1 = alteration_list_length1;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp130_ = g_strdup ("image:source");
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29049 "Photo.c"
+#line 29064 "Photo.c"
 		}
 	}
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = alteration_list;
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131__length1 = alteration_list_length1;
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp131__length1 > 0) {
-#line 29058 "Photo.c"
+#line 29073 "Photo.c"
 		gchar** _tmp132_ = NULL;
 		gint _tmp132__length1 = 0;
 		Alteration* _tmp133_ = NULL;
 		Alteration* _tmp134_ = NULL;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132_ = alteration_list;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132__length1 = alteration_list_length1;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1);
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp134_ = _tmp133_;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp134_);
-#line 29075 "Photo.c"
+#line 29090 "Photo.c"
 	}
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (old_reader);
-#line 29089 "Photo.c"
+#line 29104 "Photo.c"
 }
 
 
@@ -29105,96 +29120,96 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	gboolean _tmp43_ = FALSE;
 	gboolean _tmp44_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4025 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_halt_monitoring_editable (self);
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_halt_monitoring_editable (self);
+#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 	has_editable = FALSE;
-#line 4028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_file = NULL;
-#line 29113 "Photo.c"
+#line 29128 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29120 "Photo.c"
+#line 29135 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29130 "Photo.c"
+#line 29145 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
 				PhotoBackingReaders* _tmp6_ = NULL;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable_file);
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file = _tmp5_;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->readers;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp6_->editable);
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_->editable = NULL;
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 				has_editable = TRUE;
-#line 29153 "Photo.c"
+#line 29168 "Photo.c"
 			}
 		}
-		__finally395:
+		__finally396:
 		{
 			PhotoBackingReaders* _tmp7_ = NULL;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29163 "Photo.c"
+#line 29178 "Photo.c"
 		}
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29175 "Photo.c"
+#line 29190 "Photo.c"
 		}
 	}
-#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = has_editable;
-#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 29182 "Photo.c"
+#line 29197 "Photo.c"
 		BackingPhotoID editable_id = {0};
-#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29186 "Photo.c"
+#line 29201 "Photo.c"
 		{
 			{
 				PhotoRow* _tmp9_ = NULL;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29194 "Photo.c"
+#line 29209 "Photo.c"
 				{
 					PhotoRow* _tmp10_ = NULL;
 					BackingPhotoID _tmp11_ = {0};
@@ -29202,237 +29217,237 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					PhotoRow* _tmp16_ = NULL;
 					BackingPhotoRow* _tmp17_ = NULL;
 					BackingPhotoRow* _tmp18_ = NULL;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->row;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp10_->editable_id;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					editable_id = _tmp11_;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = backing_photo_id_is_valid (&editable_id);
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp12_) {
-#line 29212 "Photo.c"
+#line 29227 "Photo.c"
 						PhotoTable* _tmp13_ = NULL;
 						PhotoTable* _tmp14_ = NULL;
 						PhotoRow* _tmp15_ = NULL;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = photo_table_get_instance ();
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = _tmp13_;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_);
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_database_table_unref0 (_tmp14_);
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29228 "Photo.c"
-							goto __finally397;
+#line 29243 "Photo.c"
+							goto __finally398;
 						}
 					}
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_->master;
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = _backing_photo_row_ref0 (_tmp17_);
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp18_;
-#line 29242 "Photo.c"
+#line 29257 "Photo.c"
 				}
-				__finally397:
+				__finally398:
 				{
 					PhotoRow* _tmp19_ = NULL;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = self->row;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29251 "Photo.c"
+#line 29266 "Photo.c"
 				}
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29257 "Photo.c"
-						goto __catch396_database_error;
+#line 29272 "Photo.c"
+						goto __catch397_database_error;
 					}
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29268 "Photo.c"
+#line 29283 "Photo.c"
 				}
 			}
 		}
-		goto __finally396;
-		__catch396_database_error:
+		goto __finally397;
+		__catch397_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
 			const gchar* _tmp21_ = NULL;
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = err;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_->message;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4047: Unable to remove editable from PhotoTable: %s", _tmp21_);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_);
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29290 "Photo.c"
+#line 29305 "Photo.c"
 		}
-		__finally396:
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally397:
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29303 "Photo.c"
+#line 29318 "Photo.c"
 		}
 		{
 			gboolean _tmp22_ = FALSE;
-#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
-#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29311 "Photo.c"
+#line 29326 "Photo.c"
 				BackingPhotoTable* _tmp23_ = NULL;
 				BackingPhotoTable* _tmp24_ = NULL;
 				BackingPhotoID _tmp25_ = {0};
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = backing_photo_table_get_instance ();
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _tmp23_;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = editable_id;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp24_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29329 "Photo.c"
-						goto __catch398_database_error;
+#line 29344 "Photo.c"
+						goto __catch399_database_error;
 					}
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29340 "Photo.c"
+#line 29355 "Photo.c"
 				}
 			}
 		}
-		goto __finally398;
-		__catch398_database_error:
+		goto __finally399;
+		__catch399_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = err;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_->message;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4054: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29362 "Photo.c"
+#line 29377 "Photo.c"
 		}
-		__finally398:
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally399:
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29375 "Photo.c"
+#line 29390 "Photo.c"
 		}
 	}
-#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = remove_transformations;
-#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 4059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_internal_remove_all_transformations (self, FALSE);
-#line 29384 "Photo.c"
+#line 29399 "Photo.c"
 	}
-#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = has_editable;
-#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_) {
-#line 29390 "Photo.c"
+#line 29405 "Photo.c"
 		GFile* _tmp30_ = NULL;
-#line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = editable_file;
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29398 "Photo.c"
+#line 29413 "Photo.c"
 	}
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = delete_editable;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp32_) {
-#line 29404 "Photo.c"
+#line 29419 "Photo.c"
 		GFile* _tmp33_ = NULL;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = editable_file;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp33_ != NULL;
-#line 29410 "Photo.c"
+#line 29425 "Photo.c"
 	} else {
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29414 "Photo.c"
+#line 29429 "Photo.c"
 	}
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29418 "Photo.c"
+#line 29433 "Photo.c"
 		{
 			GFile* _tmp34_ = NULL;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = editable_file;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29427 "Photo.c"
-				goto __catch399_g_error;
+#line 29442 "Photo.c"
+				goto __catch400_g_error;
 			}
 		}
-		goto __finally399;
-		__catch399_g_error:
+		goto __finally400;
+		__catch400_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_ = NULL;
@@ -29442,116 +29457,116 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			gchar* _tmp39_ = NULL;
 			GError* _tmp40_ = NULL;
 			const gchar* _tmp41_ = NULL;
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = editable_file;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = g_file_get_path (_tmp35_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp36_;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _tmp38_;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = err;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = _tmp40_->message;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4070: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4072: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_);
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp39_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp37_);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29468 "Photo.c"
+#line 29483 "Photo.c"
 		}
-		__finally399:
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally400:
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29481 "Photo.c"
+#line 29496 "Photo.c"
 		}
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = has_editable;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_) {
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = TRUE;
-#line 29490 "Photo.c"
+#line 29505 "Photo.c"
 	} else {
 		gboolean _tmp45_ = FALSE;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29497 "Photo.c"
+#line 29512 "Photo.c"
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29501 "Photo.c"
+#line 29516 "Photo.c"
 		gboolean _tmp46_ = FALSE;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29507 "Photo.c"
+#line 29522 "Photo.c"
 	} else {
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29511 "Photo.c"
+#line 29526 "Photo.c"
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29515 "Photo.c"
+#line 29530 "Photo.c"
 		Alteration* _tmp47_ = NULL;
 		Alteration* _tmp48_ = NULL;
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_new ("image", "revert");
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp48_);
-#line 29526 "Photo.c"
+#line 29541 "Photo.c"
 	}
-#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29530 "Photo.c"
+#line 29545 "Photo.c"
 }
 
 
 static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_reimport_editable ((Photo*) self);
-#line 29537 "Photo.c"
+#line 29552 "Photo.c"
 }
 
 
 static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_update_editable_attributes ((Photo*) self);
-#line 29544 "Photo.c"
+#line 29559 "Photo.c"
 }
 
 
 static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_remove_editable ((Photo*) self);
-#line 29551 "Photo.c"
+#line 29566 "Photo.c"
 }
 
 
@@ -29563,20 +29578,20 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 	gchar* _tmp16_ = NULL;
 	GFileMonitorEvent _tmp17_ = 0;
 	GError * _inner_error_ = NULL;
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29569 "Photo.c"
+#line 29584 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29576 "Photo.c"
+#line 29591 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29587,181 +29602,181 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			GFile* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp9_ = FALSE;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_assert (_tmp2_ != NULL, "readers.editable != null");
 #line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_assert (_tmp2_ != NULL, "readers.editable != null");
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = file;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->editable;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_file_equal (_tmp3_, _tmp7_);
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = !_tmp8_;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp7_);
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp9_) {
-#line 29611 "Photo.c"
+#line 29626 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp10_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29618 "Photo.c"
+#line 29633 "Photo.c"
 				}
-#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29622 "Photo.c"
+#line 29637 "Photo.c"
 			}
 		}
-		__finally400:
+		__finally401:
 		{
 			PhotoBackingReaders* _tmp11_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29632 "Photo.c"
+#line 29647 "Photo.c"
 		}
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29642 "Photo.c"
+#line 29657 "Photo.c"
 		}
 	}
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = event;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = g_file_get_path (_tmp14_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4092: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp16_);
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = event;
+	g_debug ("Photo.vala:4094: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp16_);
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp17_ = event;
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp17_) {
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGED:
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 29667 "Photo.c"
+#line 29682 "Photo.c"
 		{
 			OneShotScheduler* _tmp18_ = NULL;
 			OneShotScheduler* _tmp20_ = NULL;
-#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->priv->reimport_editable_scheduler;
-#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29675 "Photo.c"
+#line 29690 "Photo.c"
 				OneShotScheduler* _tmp19_ = NULL;
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29683 "Photo.c"
+#line 29698 "Photo.c"
 			}
-#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
-#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
-#line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29691 "Photo.c"
+#line 29706 "Photo.c"
 		}
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29695 "Photo.c"
+#line 29710 "Photo.c"
 		{
 			OneShotScheduler* _tmp21_ = NULL;
 			OneShotScheduler* _tmp23_ = NULL;
-#line 4106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
-#line 4106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29703 "Photo.c"
+#line 29718 "Photo.c"
 				OneShotScheduler* _tmp22_ = NULL;
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self);
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29711 "Photo.c"
+#line 29726 "Photo.c"
 			}
-#line 4111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
-#line 4111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
-#line 4112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4114 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29719 "Photo.c"
+#line 29734 "Photo.c"
 		}
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29723 "Photo.c"
+#line 29738 "Photo.c"
 		{
 			OneShotScheduler* _tmp24_ = NULL;
 			OneShotScheduler* _tmp26_ = NULL;
-#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->priv->remove_editable_scheduler;
-#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29731 "Photo.c"
+#line 29746 "Photo.c"
 				OneShotScheduler* _tmp25_ = NULL;
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->remove_editable_scheduler = _tmp25_;
-#line 29739 "Photo.c"
+#line 29754 "Photo.c"
 			}
-#line 4120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
-#line 4120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
-#line 4121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29747 "Photo.c"
+#line 29762 "Photo.c"
 		}
 		default:
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29752 "Photo.c"
+#line 29767 "Photo.c"
 		{
-#line 4126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29756 "Photo.c"
+#line 29771 "Photo.c"
 		}
 	}
-#line 4131 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29761 "Photo.c"
+#line 29776 "Photo.c"
 }
 
 
@@ -29769,67 +29784,67 @@ static void photo_on_reimport_editable (Photo* self) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4134 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (IS_PHOTO (self));
 #line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_discard_prefetched (self);
+	g_return_if_fail (IS_PHOTO (self));
 #line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_discard_prefetched (self);
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4138: Reimporting editable for %s", _tmp1_);
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_);
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29781 "Photo.c"
+#line 29796 "Photo.c"
 	{
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable (self, &_inner_error_);
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29787 "Photo.c"
-			goto __catch401_g_error;
+#line 29802 "Photo.c"
+			goto __catch402_g_error;
 		}
 	}
-	goto __finally401;
-	__catch401_g_error:
+	goto __finally402;
+	__catch402_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4142: Unable to reimport photo %s changed by external edito" \
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4144: Unable to reimport photo %s changed by external edito" \
 "r: %s", _tmp3_, _tmp5_);
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp3_);
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29817 "Photo.c"
+#line 29832 "Photo.c"
 	}
-	__finally401:
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally402:
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29828 "Photo.c"
+#line 29843 "Photo.c"
 	}
 }
 
@@ -29838,56 +29853,56 @@ static void photo_on_update_editable_attributes (Photo* self) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4148: Updating editable attributes for %s", _tmp1_);
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_);
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29847 "Photo.c"
+#line 29862 "Photo.c"
 	{
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_update_editable_attributes (self, &_inner_error_);
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29853 "Photo.c"
-			goto __catch402_g_error;
+#line 29868 "Photo.c"
+			goto __catch403_g_error;
 		}
 	}
-	goto __finally402;
-	__catch402_g_error:
+	goto __finally403;
+	__catch403_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4152: Unable to update editable attributes: %s", _tmp3_);
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_);
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29875 "Photo.c"
+#line 29890 "Photo.c"
 	}
-	__finally402:
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally403:
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29886 "Photo.c"
+#line 29901 "Photo.c"
 	}
 }
 
@@ -29903,68 +29918,68 @@ static void photo_on_remove_editable (Photo* self) {
 	gboolean _tmp5_ = FALSE;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 4157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29916 "Photo.c"
+#line 29931 "Photo.c"
 	}
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 29930 "Photo.c"
+#line 29945 "Photo.c"
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:4163: Not removing editable for %s: file exists", _tmp7_);
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp7_);
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_object_unref0 (file);
+		g_debug ("Photo.vala:4165: Not removing editable for %s: file exists", _tmp7_);
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp7_);
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_object_unref0 (file);
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29947 "Photo.c"
+#line 29962 "Photo.c"
 	}
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4168: Removing editable for %s: file no longer exists", _tmp9_);
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4170: Removing editable for %s: file no longer exists", _tmp9_);
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp9_);
-#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4171 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, FALSE, TRUE, TRUE);
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 29963 "Photo.c"
+#line 29978 "Photo.c"
 }
 
 
@@ -29975,25 +29990,25 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp1_ = 0;
 	Dimensions _tmp2_ = {0};
 	Dimensions _tmp3_ = {0};
-#line 4177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp1_;
 #line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp1_;
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_);
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp3_;
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 29992 "Photo.c"
+#line 30007 "Photo.c"
 }
 
 
@@ -30001,19 +30016,19 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp0_ = 0;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
-#line 4185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4187 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_original_orientation (self);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp1_);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp2_;
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30012 "Photo.c"
+#line 30027 "Photo.c"
 }
 
 
@@ -30029,77 +30044,77 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	Orientation _tmp3_ = 0;
 	PhotoException _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 4190 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO (self), FALSE);
+#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_raw_crop (self, &_tmp0_);
-#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw = _tmp0_;
-#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4193 "/home/jens/Source/shotwell/src/Photo.vala"
-		box_init (&_vala_crop, 0, 0, 0, 0);
 #line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+		box_init (&_vala_crop, 0, 0, 0, 0);
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 30044 "Photo.c"
+#line 30059 "Photo.c"
 		}
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30048 "Photo.c"
+#line 30063 "Photo.c"
 	}
-#line 4198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_);
-#line 4198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp2_;
-#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_orientation (self);
-#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp3_;
 #line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp3_;
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = exceptions;
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30064 "Photo.c"
+#line 30079 "Photo.c"
 		Orientation _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		Box _tmp8_ = {0};
 		Box _tmp9_ = {0};
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = orientation;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = dim;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = raw;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp9_;
-#line 30079 "Photo.c"
+#line 30094 "Photo.c"
 	} else {
 		Box _tmp10_ = {0};
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30086 "Photo.c"
+#line 30101 "Photo.c"
 	}
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 30094 "Photo.c"
+#line 30109 "Photo.c"
 	}
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30098 "Photo.c"
+#line 30113 "Photo.c"
 }
 
 
@@ -30137,87 +30152,87 @@ void photo_set_crop (Photo* self, Box* crop) {
 	gint _tmp27_ = 0;
 	gint _tmp28_ = 0;
 	Box _tmp29_ = {0};
-#line 4210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 4211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp0_);
-#line 4211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp1_;
 #line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp1_;
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = *crop;
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated = _tmp4_;
 #line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated = _tmp4_;
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = derotated;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.left;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = dim;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_.width;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2);
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.left = _tmp9_;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = derotated;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.right;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = derotated;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.left;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = dim;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.width;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1);
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated.right = _tmp16_;
 #line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated.right = _tmp16_;
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = derotated;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_.top;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = dim;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = _tmp19_.height;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2);
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.top = _tmp21_;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = derotated;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.bottom;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = derotated;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_.top;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dim;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = _tmp26_.height;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1);
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated.bottom = _tmp28_;
 #line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated.bottom = _tmp28_;
+#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = derotated;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_crop (self, &_tmp29_);
-#line 30216 "Photo.c"
+#line 30231 "Photo.c"
 }
 
 
@@ -30226,49 +30241,49 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	gboolean result = FALSE;
 	gdouble _tmp0_ = 0.0;
 	gboolean _tmp1_ = FALSE;
-#line 4225 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_raw_straighten (self, &_tmp0_);
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_theta = _tmp0_;
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (theta) {
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30239 "Photo.c"
+#line 30254 "Photo.c"
 		}
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30243 "Photo.c"
+#line 30258 "Photo.c"
 	}
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (theta) {
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30251 "Photo.c"
+#line 30266 "Photo.c"
 	}
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30255 "Photo.c"
+#line 30270 "Photo.c"
 }
 
 
 void photo_set_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp0_ = 0.0;
-#line 4232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4234 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = theta;
-#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30267 "Photo.c"
+#line 30282 "Photo.c"
 }
 
 
@@ -30326,48 +30341,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	gint _tmp96__length1 = 0;
 	GdkPixbuf* _tmp133_ = NULL;
 	GdkPixbuf* _tmp134_ = NULL;
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (inst != NULL, NULL);
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *inst;
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.radius;
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	r = (gdouble) _tmp1_;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *inst;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.radius;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = g_new0 (gint, _tmp3_ + 1);
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = _tmp4_;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant_length1 = _tmp3_ + 1;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
-	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
 #line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
+#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
 	i = 0;
-#line 30351 "Photo.c"
+#line 30366 "Photo.c"
 	{
 		gdouble y = 0.0;
 		gdouble _tmp5_ = 0.0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = r;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30359 "Photo.c"
+#line 30374 "Photo.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30366 "Photo.c"
+#line 30381 "Photo.c"
 				gdouble _tmp8_ = 0.0;
 				gdouble theta = 0.0;
 				gdouble _tmp9_ = 0.0;
@@ -30385,178 +30400,178 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30386 "Photo.c"
+#line 30401 "Photo.c"
 					gdouble _tmp7_ = 0.0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp7_ = y;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					y = _tmp7_ - 1.0;
-#line 30392 "Photo.c"
+#line 30407 "Photo.c"
 				}
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = y;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp8_ >= 0.0)) {
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30402 "Photo.c"
+#line 30417 "Photo.c"
 				}
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = r;
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = asin (_tmp9_ / _tmp10_);
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				theta = _tmp11_;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = r;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = theta;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = cos (_tmp13_);
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				x = (gint) ((_tmp12_ * _tmp14_) + 0.5);
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = x_insets_first_quadrant;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15__length1 = x_insets_first_quadrant_length1;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *inst;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.radius;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = x;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_[_tmp16_] = _tmp18_ - _tmp19_;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp20_ = _tmp15_[_tmp16_];
 #line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp20_ = _tmp15_[_tmp16_];
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = i;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 				i = _tmp21_ + 1;
-#line 30440 "Photo.c"
+#line 30455 "Photo.c"
 			}
 		}
 	}
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = *inst;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.center;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_.x;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = *inst;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_.radius;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_min = _tmp24_ - _tmp26_;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = *inst;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.center;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.x;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = *inst;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_.radius;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_max = _tmp29_ + _tmp31_;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_.center;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_.y;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_.radius;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp34_ - _tmp36_;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = ymin;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_ < 0) {
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = 0;
-#line 30486 "Photo.c"
+#line 30501 "Photo.c"
 	} else {
 		gint _tmp39_ = 0;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30493 "Photo.c"
+#line 30508 "Photo.c"
 	}
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = *inst;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.center;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_.y;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp42_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = ymax;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = pixbuf;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = gdk_pixbuf_get_height (_tmp45_);
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30515 "Photo.c"
+#line 30530 "Photo.c"
 		GdkPixbuf* _tmp48_ = NULL;
 		gint _tmp49_ = 0;
 		gint _tmp50_ = 0;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = pixbuf;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = gdk_pixbuf_get_height (_tmp48_);
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = _tmp49_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp50_ - 1;
-#line 30527 "Photo.c"
+#line 30542 "Photo.c"
 	} else {
 		gint _tmp51_ = 0;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30534 "Photo.c"
+#line 30549 "Photo.c"
 	}
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp43_;
-#line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = 0;
-#line 30540 "Photo.c"
+#line 30555 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp52_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = ymin;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30548 "Photo.c"
+#line 30563 "Photo.c"
 		{
 			gboolean _tmp53_ = FALSE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = TRUE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30555 "Photo.c"
+#line 30570 "Photo.c"
 				gint _tmp55_ = 0;
 				gint _tmp56_ = 0;
 				gint xmin = 0;
@@ -30579,118 +30594,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp71_ = 0;
 				gint _tmp72_ = 0;
 				gint _tmp87_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30580 "Photo.c"
+#line 30595 "Photo.c"
 					gint _tmp54_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = y_it;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp54_ + 1;
-#line 30586 "Photo.c"
+#line 30601 "Photo.c"
 				}
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = y_it;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = ymax;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp55_ <= _tmp56_)) {
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30598 "Photo.c"
+#line 30613 "Photo.c"
 				}
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = x_insets_first_quadrant;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58__length1 = x_insets_first_quadrant_length1;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = inset_index;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp58_[_tmp59_];
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp57_ + _tmp60_;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = xmin;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp62_ < 0) {
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = 0;
-#line 30618 "Photo.c"
+#line 30633 "Photo.c"
 				} else {
 					gint _tmp63_ = 0;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30625 "Photo.c"
+#line 30640 "Photo.c"
 				}
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = x_bounds_max;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = x_insets_first_quadrant;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65__length1 = x_insets_first_quadrant_length1;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = inset_index;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = _tmp65_[_tmp66_];
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp64_ - _tmp67_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = xmax;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = pixbuf;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = gdk_pixbuf_get_width (_tmp70_);
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30651 "Photo.c"
+#line 30666 "Photo.c"
 					GdkPixbuf* _tmp73_ = NULL;
 					gint _tmp74_ = 0;
 					gint _tmp75_ = 0;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp73_ = pixbuf;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp74_ = gdk_pixbuf_get_width (_tmp73_);
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp75_ = _tmp74_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp75_ - 1;
-#line 30663 "Photo.c"
+#line 30678 "Photo.c"
 				} else {
 					gint _tmp76_ = 0;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30670 "Photo.c"
+#line 30685 "Photo.c"
 				}
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30674 "Photo.c"
+#line 30689 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp77_ = 0;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp77_ = xmin;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30682 "Photo.c"
+#line 30697 "Photo.c"
 					{
 						gboolean _tmp78_ = FALSE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp78_ = TRUE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30689 "Photo.c"
+#line 30704 "Photo.c"
 							gint _tmp80_ = 0;
 							gint _tmp81_ = 0;
 							GdkPixbuf* _tmp82_ = NULL;
@@ -30698,94 +30713,94 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp84_ = 0;
 							GdkPixbuf* _tmp85_ = NULL;
 							GdkPixbuf* _tmp86_ = NULL;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30699 "Photo.c"
+#line 30714 "Photo.c"
 								gint _tmp79_ = 0;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp79_ = x_it;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp79_ + 1;
-#line 30705 "Photo.c"
+#line 30720 "Photo.c"
 							}
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp80_ = x_it;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp81_ = xmax;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp80_ <= _tmp81_)) {
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30717 "Photo.c"
+#line 30732 "Photo.c"
 							}
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp83_ = x_it;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp84_ = y_it;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_);
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp86_ = _tmp85_;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp86_);
-#line 30731 "Photo.c"
+#line 30746 "Photo.c"
 						}
 					}
 				}
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp87_ = inset_index;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp87_ + 1;
-#line 30739 "Photo.c"
+#line 30754 "Photo.c"
 			}
 		}
 	}
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = *inst;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = _tmp88_.center;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_.y;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp90_;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = *inst;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_.center;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_.y;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = *inst;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = _tmp94_.radius;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp93_ + _tmp95_;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = x_insets_first_quadrant;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96__length1 = x_insets_first_quadrant_length1;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = _tmp96__length1 - 1;
-#line 30769 "Photo.c"
+#line 30784 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp97_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = ymin;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30777 "Photo.c"
+#line 30792 "Photo.c"
 		{
 			gboolean _tmp98_ = FALSE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = TRUE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30784 "Photo.c"
+#line 30799 "Photo.c"
 				gint _tmp100_ = 0;
 				gint _tmp101_ = 0;
 				gint xmin = 0;
@@ -30808,118 +30823,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp116_ = 0;
 				gint _tmp117_ = 0;
 				gint _tmp132_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30809 "Photo.c"
+#line 30824 "Photo.c"
 					gint _tmp99_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp99_ = y_it;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp99_ + 1;
-#line 30815 "Photo.c"
+#line 30830 "Photo.c"
 				}
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp100_ = y_it;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp101_ = ymax;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp100_ <= _tmp101_)) {
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30827 "Photo.c"
+#line 30842 "Photo.c"
 				}
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103_ = x_insets_first_quadrant;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103__length1 = x_insets_first_quadrant_length1;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp104_ = inset_index;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp105_ = _tmp103_[_tmp104_];
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp102_ + _tmp105_;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = xmin;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp107_ < 0) {
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = 0;
-#line 30847 "Photo.c"
+#line 30862 "Photo.c"
 				} else {
 					gint _tmp108_ = 0;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30854 "Photo.c"
+#line 30869 "Photo.c"
 				}
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp109_ = x_bounds_max;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = x_insets_first_quadrant;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110__length1 = x_insets_first_quadrant_length1;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = inset_index;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp110_[_tmp111_];
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp109_ - _tmp112_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp114_ = xmax;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = pixbuf;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = gdk_pixbuf_get_width (_tmp115_);
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30880 "Photo.c"
+#line 30895 "Photo.c"
 					GdkPixbuf* _tmp118_ = NULL;
 					gint _tmp119_ = 0;
 					gint _tmp120_ = 0;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp118_ = pixbuf;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = gdk_pixbuf_get_width (_tmp118_);
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = _tmp119_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp120_ - 1;
-#line 30892 "Photo.c"
+#line 30907 "Photo.c"
 				} else {
 					gint _tmp121_ = 0;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 30899 "Photo.c"
+#line 30914 "Photo.c"
 				}
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 30903 "Photo.c"
+#line 30918 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp122_ = 0;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = xmin;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 30911 "Photo.c"
+#line 30926 "Photo.c"
 					{
 						gboolean _tmp123_ = FALSE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp123_ = TRUE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30918 "Photo.c"
+#line 30933 "Photo.c"
 							gint _tmp125_ = 0;
 							gint _tmp126_ = 0;
 							GdkPixbuf* _tmp127_ = NULL;
@@ -30927,63 +30942,63 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp129_ = 0;
 							GdkPixbuf* _tmp130_ = NULL;
 							GdkPixbuf* _tmp131_ = NULL;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 30928 "Photo.c"
+#line 30943 "Photo.c"
 								gint _tmp124_ = 0;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp124_ = x_it;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp124_ + 1;
-#line 30934 "Photo.c"
+#line 30949 "Photo.c"
 							}
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp125_ = x_it;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp126_ = xmax;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp125_ <= _tmp126_)) {
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30946 "Photo.c"
+#line 30961 "Photo.c"
 							}
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp128_ = x_it;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp129_ = y_it;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_);
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp131_ = _tmp130_;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp131_);
-#line 30960 "Photo.c"
+#line 30975 "Photo.c"
 						}
 					}
 				}
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp132_ = inset_index;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp132_ - 1;
-#line 30968 "Photo.c"
+#line 30983 "Photo.c"
 			}
 		}
 	}
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = pixbuf;
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _g_object_ref0 (_tmp133_);
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp134_;
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30982 "Photo.c"
+#line 30997 "Photo.c"
 }
 
 
@@ -31002,89 +31017,89 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	gint _tmp9_ = 0;
 	GdkPixbuf* _tmp33_ = NULL;
 	GdkPixbuf* _tmp34_ = NULL;
-#line 4300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = y;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixbuf;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = x;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = x;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ >= 0) {
-#line 31023 "Photo.c"
+#line 31038 "Photo.c"
 		gint _tmp10_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31029 "Photo.c"
+#line 31044 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31033 "Photo.c"
+#line 31048 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31037 "Photo.c"
+#line 31052 "Photo.c"
 		gint _tmp11_ = 0;
 		GdkPixbuf* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = x;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = pixbuf;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = gdk_pixbuf_get_width (_tmp12_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < _tmp14_;
-#line 31052 "Photo.c"
+#line 31067 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31056 "Photo.c"
+#line 31071 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31060 "Photo.c"
+#line 31075 "Photo.c"
 		gint _tmp15_ = 0;
 		GdkPixbuf* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = y;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = pixbuf;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp15_ < _tmp18_;
-#line 31075 "Photo.c"
+#line 31090 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31079 "Photo.c"
+#line 31094 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31083 "Photo.c"
+#line 31098 "Photo.c"
 		guchar* pixel_data = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		guint8* _tmp20_ = NULL;
@@ -31108,65 +31123,65 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		gint _tmp30_ = 0;
 		guchar _tmp31_ = '\0';
 		guchar _tmp32_ = '\0';
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = pixbuf;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = gdk_pixbuf_get_pixels (_tmp19_);
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data = _tmp20_;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data_length1 = -1;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_data_size_ = pixel_data_length1;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = pixel_data;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21__length1 = pixel_data_length1;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = px_start_byte_offset;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp21_[_tmp22_ + 1];
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		g = _tmp23_;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = pixel_data;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24__length1 = pixel_data_length1;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = px_start_byte_offset;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp24_[_tmp25_ + 2];
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
-		b = _tmp26_;
 #line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+		b = _tmp26_;
+#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = g;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = b;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
-		r = (guchar) ((_tmp27_ + _tmp28_) / 2);
 #line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+		r = (guchar) ((_tmp27_ + _tmp28_) / 2);
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = pixel_data;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = pixel_data_length1;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = px_start_byte_offset;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = r;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_[_tmp30_] = _tmp31_;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp29_[_tmp30_];
-#line 31155 "Photo.c"
+#line 31170 "Photo.c"
 	}
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp34_;
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31165 "Photo.c"
+#line 31180 "Photo.c"
 }
 
 
@@ -31191,78 +31206,78 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	gint _tmp15_ = 0;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_point != NULL);
-#line 4331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_orientation (self);
-#line 4331 "/home/jens/Source/shotwell/src/Photo.vala"
-	unscaled_orientation = _tmp0_;
 #line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+	unscaled_orientation = _tmp0_;
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = unscaled_orientation;
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_);
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_);
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_dims = _tmp3_;
-#line 4336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4338 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_x_offset_raw = 0;
-#line 4337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4339 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_y_offset_raw = 0;
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_raw_crop (self, &_tmp4_);
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	crop_box = _tmp4_;
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 31216 "Photo.c"
+#line 31231 "Photo.c"
 		Box _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		Box _tmp8_ = {0};
 		gint _tmp9_ = 0;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = crop_box;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_.left;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_x_offset_raw = _tmp7_;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = crop_box;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_.top;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_y_offset_raw = _tmp9_;
-#line 31233 "Photo.c"
+#line 31248 "Photo.c"
 	}
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = unscaled_dims;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_point;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_);
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point = _tmp13_;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = derotated_point.x;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = unscaled_x_offset_raw;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point.x = _tmp14_ + _tmp15_;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = derotated_point.y;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = unscaled_y_offset_raw;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated_point.y = _tmp16_ + _tmp17_;
 #line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated_point.y = _tmp16_ + _tmp17_;
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = derotated_point;
-#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31261 "Photo.c"
+#line 31276 "Photo.c"
 }
 
 
@@ -31308,171 +31323,171 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	gint _tmp45_ = 0;
 	GdkPoint _tmp46_ = {0};
 	gint _tmp47_ = 0;
-#line 4355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_rect != NULL);
-#line 4356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_.x = 0;
-#line 4356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp0_;
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_.x = 0;
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right = _tmp1_;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *unscaled_rect;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.x;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.x = _tmp3_;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = *unscaled_rect;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_.y;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.y = _tmp5_;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = upper_left;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_.x;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *unscaled_rect;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.width;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = upper_left;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.y;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_rect;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.height;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
-	lower_right.y = _tmp11_ + _tmp13_;
 #line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+	lower_right.y = _tmp11_ + _tmp13_;
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = upper_left;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp14_, &_tmp15_);
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp15_;
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = lower_right;
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp16_, &_tmp17_);
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
-	lower_right = _tmp17_;
 #line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+	lower_right = _tmp17_;
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = upper_left;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.x;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = lower_right;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_.x;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 31373 "Photo.c"
+#line 31388 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		GdkPoint _tmp24_ = {0};
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = upper_left;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_.x;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp23_;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = lower_right;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_.x;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.x = _tmp25_;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = temp;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.x = _tmp26_;
-#line 31396 "Photo.c"
+#line 31411 "Photo.c"
 	}
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.y;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = lower_right;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_.y;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_ > _tmp30_) {
-#line 31408 "Photo.c"
+#line 31423 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPoint _tmp33_ = {0};
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = upper_left;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_.y;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp32_;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = lower_right;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = _tmp33_.y;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.y = _tmp34_;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = temp;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.y = _tmp35_;
-#line 31431 "Photo.c"
+#line 31446 "Photo.c"
 	}
-#line 4377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = upper_left;
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_.x;
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.x = _tmp37_;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = upper_left;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_.y;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.y = _tmp39_;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = lower_right;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.x;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = upper_left;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_.x;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.width = _tmp41_ - _tmp43_;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = lower_right;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_.y;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = upper_left;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_.y;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
-	raw_rect.height = _tmp45_ - _tmp47_;
 #line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+	raw_rect.height = _tmp45_ - _tmp47_;
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = raw_rect;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31471 "Photo.c"
+#line 31486 "Photo.c"
 }
 
 
@@ -31483,85 +31498,85 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	GdkPixbuf* _tmp4_ = NULL;
 	PixelTransformationBundle* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31486 "Photo.c"
+#line 31501 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_for_best_fit (360, FALSE, &_tmp1_);
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp2_;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31500 "Photo.c"
-			goto __catch403_g_error;
+#line 31515 "Photo.c"
+			goto __catch404_g_error;
 		}
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp3_;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31513 "Photo.c"
+#line 31528 "Photo.c"
 	}
-	goto __finally403;
-	__catch403_g_error:
+	goto __finally404;
+	__catch404_g_error:
 	{
 		GError* e = NULL;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		e = _inner_error_;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4401: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram");
 #line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4403: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram");
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (e);
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31533 "Photo.c"
+#line 31548 "Photo.c"
 	}
-	__finally403:
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally404:
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 31546 "Photo.c"
+#line 31561 "Photo.c"
 	}
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = auto_enhance_create_auto_enhance_adjustments (_tmp4_);
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformations = _tmp5_;
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = transformations;
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31560 "Photo.c"
+#line 31575 "Photo.c"
 }
 
 
@@ -31571,68 +31586,68 @@ gboolean photo_enhance (Photo* self) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4423 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_enhance_transformations (self);
-#line 4422 "/home/jens/Source/shotwell/src/Photo.vala"
-	transformations = _tmp0_;
 #line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+	transformations = _tmp0_;
+#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = transformations;
-#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (transformations);
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31586 "Photo.c"
+#line 31601 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31594 "Photo.c"
+#line 31609 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp3_ = NULL;
-#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = transformations;
-#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_color_adjustments (self, _tmp3_);
-#line 31601 "Photo.c"
+#line 31616 "Photo.c"
 		}
-		__finally404:
+		__finally405:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31610 "Photo.c"
+#line 31625 "Photo.c"
 		}
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (transformations);
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 31622 "Photo.c"
+#line 31637 "Photo.c"
 		}
 	}
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (transformations);
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31631 "Photo.c"
+#line 31646 "Photo.c"
 }
 
 
@@ -31645,7 +31660,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) {
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31644 "Photo.c"
+#line 31659 "Photo.c"
 }
 
 
@@ -31655,7 +31670,7 @@ void photo_set_develop_raw_photos_to_files (gboolean value) {
 	_tmp0_ = value;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo__develop_raw_photos_to_files = _tmp0_;
-#line 31654 "Photo.c"
+#line 31669 "Photo.c"
 }
 
 
@@ -31664,7 +31679,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
 #line 358 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 31663 "Photo.c"
+#line 31678 "Photo.c"
 }
 
 
@@ -31683,19 +31698,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31682 "Photo.c"
+#line 31697 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31688 "Photo.c"
+#line 31703 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 31694 "Photo.c"
+#line 31709 "Photo.c"
 }
 
 
@@ -31710,7 +31725,7 @@ static void photo_real_baseline_replaced (Photo* self) {
 static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 376 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31709 "Photo.c"
+#line 31724 "Photo.c"
 }
 
 
@@ -31729,47 +31744,47 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31728 "Photo.c"
+#line 31743 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31734 "Photo.c"
+#line 31749 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, value_get_media_metadata (param_values + 1), data2);
-#line 31740 "Photo.c"
+#line 31755 "Photo.c"
 }
 
 
 static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31747 "Photo.c"
+#line 31762 "Photo.c"
 }
 
 
 static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 387 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31754 "Photo.c"
+#line 31769 "Photo.c"
 }
 
 
 static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 394 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31761 "Photo.c"
+#line 31776 "Photo.c"
 }
 
 
 static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) {
 #line 257 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self);
-#line 31768 "Photo.c"
+#line 31783 "Photo.c"
 }
 
 
@@ -31837,14 +31852,14 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_
 	g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0);
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 31836 "Photo.c"
+#line 31851 "Photo.c"
 }
 
 
 static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments);
-#line 31843 "Photo.c"
+#line 31858 "Photo.c"
 }
 
 
@@ -31859,7 +31874,7 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31858 "Photo.c"
+#line 31873 "Photo.c"
 }
 
 
@@ -31877,7 +31892,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph
 	result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31876 "Photo.c"
+#line 31891 "Photo.c"
 }
 
 
@@ -31891,7 +31906,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 	_tmp1_ = self->priv->transformer;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 31890 "Photo.c"
+#line 31905 "Photo.c"
 		PixelTransformer* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31902,19 +31917,19 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 31901 "Photo.c"
+#line 31916 "Photo.c"
 	} else {
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 31907 "Photo.c"
+#line 31922 "Photo.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31913 "Photo.c"
+#line 31928 "Photo.c"
 }
 
 
@@ -31928,7 +31943,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 	_tmp1_ = self->priv->adjustments;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 31927 "Photo.c"
+#line 31942 "Photo.c"
 		PixelTransformationBundle* _tmp2_ = NULL;
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31939,19 +31954,19 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 31938 "Photo.c"
+#line 31953 "Photo.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 31944 "Photo.c"
+#line 31959 "Photo.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31950 "Photo.c"
+#line 31965 "Photo.c"
 }
 
 
@@ -31970,13 +31985,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		result = NULL;
 #line 279 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31969 "Photo.c"
+#line 31984 "Photo.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	clone = _tmp1_;
-#line 31975 "Photo.c"
+#line 31990 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp2_ = NULL;
@@ -32003,7 +32018,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		_object_it = _tmp7_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 32002 "Photo.c"
+#line 32017 "Photo.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			gchar* object = NULL;
@@ -32025,7 +32040,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32024 "Photo.c"
+#line 32039 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32057,17 +32072,17 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			_key_value_map_unref0 (_tmp17_);
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (object);
-#line 32056 "Photo.c"
+#line 32071 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32060 "Photo.c"
+#line 32075 "Photo.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = clone;
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32066 "Photo.c"
+#line 32081 "Photo.c"
 }
 
 
@@ -32081,7 +32096,7 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph
 	if (!_tmp0_) {
 #line 290 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken");
-#line 32080 "Photo.c"
+#line 32095 "Photo.c"
 	}
 }
 
@@ -32093,14 +32108,14 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor
 	g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate));
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize;
-#line 32092 "Photo.c"
+#line 32107 "Photo.c"
 }
 
 
 static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) {
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self);
-#line 32099 "Photo.c"
+#line 32114 "Photo.c"
 }
 
 
@@ -32126,7 +32141,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject* obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj);
-#line 32125 "Photo.c"
+#line 32140 "Photo.c"
 }
 
 
@@ -32148,21 +32163,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type)
 	self = (PhotoBackingReaders*) g_type_create_instance (object_type);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32147 "Photo.c"
+#line 32162 "Photo.c"
 }
 
 
 static PhotoBackingReaders* photo_backing_readers_new (void) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS);
-#line 32154 "Photo.c"
+#line 32169 "Photo.c"
 }
 
 
 static void photo_value_backing_readers_init (GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32161 "Photo.c"
+#line 32176 "Photo.c"
 }
 
 
@@ -32171,7 +32186,7 @@ static void photo_value_backing_readers_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (value->data[0].v_pointer);
-#line 32170 "Photo.c"
+#line 32185 "Photo.c"
 	}
 }
 
@@ -32181,11 +32196,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer);
-#line 32180 "Photo.c"
+#line 32195 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32184 "Photo.c"
+#line 32199 "Photo.c"
 	}
 }
 
@@ -32193,37 +32208,37 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32192 "Photo.c"
+#line 32207 "Photo.c"
 }
 
 
 static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32199 "Photo.c"
+#line 32214 "Photo.c"
 		PhotoBackingReaders* object;
 		object = collect_values[0].v_pointer;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32206 "Photo.c"
+#line 32221 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32210 "Photo.c"
+#line 32225 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32214 "Photo.c"
+#line 32229 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32218 "Photo.c"
+#line 32233 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32222 "Photo.c"
+#line 32237 "Photo.c"
 }
 
 
@@ -32234,25 +32249,25 @@ static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32233 "Photo.c"
+#line 32248 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32239 "Photo.c"
+#line 32254 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32243 "Photo.c"
+#line 32258 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32247 "Photo.c"
+#line 32262 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32251 "Photo.c"
+#line 32266 "Photo.c"
 }
 
 
@@ -32266,7 +32281,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32265 "Photo.c"
+#line 32280 "Photo.c"
 }
 
 
@@ -32275,7 +32290,7 @@ static gpointer photo_value_get_backing_readers (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32274 "Photo.c"
+#line 32289 "Photo.c"
 }
 
 
@@ -32295,17 +32310,17 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32294 "Photo.c"
+#line 32309 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32298 "Photo.c"
+#line 32313 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32304 "Photo.c"
+#line 32319 "Photo.c"
 	}
 }
 
@@ -32324,17 +32339,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32323 "Photo.c"
+#line 32338 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32327 "Photo.c"
+#line 32342 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32333 "Photo.c"
+#line 32348 "Photo.c"
 	}
 }
 
@@ -32344,14 +32359,14 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass)
 	photo_backing_readers_parent_class = g_type_class_peek_parent (klass);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize;
-#line 32343 "Photo.c"
+#line 32358 "Photo.c"
 }
 
 
 static void photo_backing_readers_instance_init (PhotoBackingReaders * self) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32350 "Photo.c"
+#line 32365 "Photo.c"
 }
 
 
@@ -32367,7 +32382,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders* obj) {
 	_photo_file_adapter_unref0 (self->developer);
 #line 297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (self->editable);
-#line 32366 "Photo.c"
+#line 32381 "Photo.c"
 }
 
 
@@ -32392,7 +32407,7 @@ static gpointer photo_backing_readers_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32391 "Photo.c"
+#line 32406 "Photo.c"
 }
 
 
@@ -32405,7 +32420,7 @@ static void photo_backing_readers_unref (gpointer instance) {
 		PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32404 "Photo.c"
+#line 32419 "Photo.c"
 	}
 }
 
@@ -32440,21 +32455,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot
 	self->pixbuf = _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32439 "Photo.c"
+#line 32454 "Photo.c"
 }
 
 
 static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) {
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf);
-#line 32446 "Photo.c"
+#line 32461 "Photo.c"
 }
 
 
 static void photo_value_cached_pixbuf_init (GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32453 "Photo.c"
+#line 32468 "Photo.c"
 }
 
 
@@ -32463,7 +32478,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (value->data[0].v_pointer);
-#line 32462 "Photo.c"
+#line 32477 "Photo.c"
 	}
 }
 
@@ -32473,11 +32488,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer);
-#line 32472 "Photo.c"
+#line 32487 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32476 "Photo.c"
+#line 32491 "Photo.c"
 	}
 }
 
@@ -32485,37 +32500,37 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32484 "Photo.c"
+#line 32499 "Photo.c"
 }
 
 
 static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32491 "Photo.c"
+#line 32506 "Photo.c"
 		PhotoCachedPixbuf* object;
 		object = collect_values[0].v_pointer;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32498 "Photo.c"
+#line 32513 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32502 "Photo.c"
+#line 32517 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32506 "Photo.c"
+#line 32521 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32510 "Photo.c"
+#line 32525 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32514 "Photo.c"
+#line 32529 "Photo.c"
 }
 
 
@@ -32526,25 +32541,25 @@ static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32525 "Photo.c"
+#line 32540 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32531 "Photo.c"
+#line 32546 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32535 "Photo.c"
+#line 32550 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32539 "Photo.c"
+#line 32554 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32543 "Photo.c"
+#line 32558 "Photo.c"
 }
 
 
@@ -32558,7 +32573,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32557 "Photo.c"
+#line 32572 "Photo.c"
 }
 
 
@@ -32567,7 +32582,7 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32566 "Photo.c"
+#line 32581 "Photo.c"
 }
 
 
@@ -32587,17 +32602,17 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32586 "Photo.c"
+#line 32601 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32590 "Photo.c"
+#line 32605 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32596 "Photo.c"
+#line 32611 "Photo.c"
 	}
 }
 
@@ -32616,17 +32631,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32615 "Photo.c"
+#line 32630 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32619 "Photo.c"
+#line 32634 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32625 "Photo.c"
+#line 32640 "Photo.c"
 	}
 }
 
@@ -32636,7 +32651,7 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) {
 	photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize;
-#line 32635 "Photo.c"
+#line 32650 "Photo.c"
 }
 
 
@@ -32648,7 +32663,7 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) {
 	self->last_touched = _tmp0_;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32647 "Photo.c"
+#line 32662 "Photo.c"
 }
 
 
@@ -32664,7 +32679,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) {
 	_g_object_unref0 (self->pixbuf);
 #line 303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_timer_destroy0 (self->last_touched);
-#line 32663 "Photo.c"
+#line 32678 "Photo.c"
 }
 
 
@@ -32689,7 +32704,7 @@ static gpointer photo_cached_pixbuf_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32688 "Photo.c"
+#line 32703 "Photo.c"
 }
 
 
@@ -32702,224 +32717,224 @@ static void photo_cached_pixbuf_unref (gpointer instance) {
 		PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32701 "Photo.c"
+#line 32716 "Photo.c"
 	}
 }
 
 
 PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) {
 	PhotoReimportMasterState* self = NULL;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32712 "Photo.c"
+#line 32727 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_init (GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32719 "Photo.c"
+#line 32734 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_free_value (GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32728 "Photo.c"
+#line 32743 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer);
-#line 32738 "Photo.c"
+#line 32753 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32742 "Photo.c"
+#line 32757 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32750 "Photo.c"
+#line 32765 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32757 "Photo.c"
+#line 32772 "Photo.c"
 		PhotoReimportMasterState* object;
 		object = collect_values[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32764 "Photo.c"
+#line 32779 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32768 "Photo.c"
+#line 32783 "Photo.c"
 		}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32772 "Photo.c"
+#line 32787 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32776 "Photo.c"
+#line 32791 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32780 "Photo.c"
+#line 32795 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportMasterState** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32791 "Photo.c"
+#line 32806 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32797 "Photo.c"
+#line 32812 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32801 "Photo.c"
+#line 32816 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32805 "Photo.c"
+#line 32820 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32809 "Photo.c"
+#line 32824 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportMasterState* spec;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32823 "Photo.c"
+#line 32838 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_master_state (const GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32832 "Photo.c"
+#line 32847 "Photo.c"
 }
 
 
 void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState* old;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32852 "Photo.c"
+#line 32867 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32856 "Photo.c"
+#line 32871 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32862 "Photo.c"
+#line 32877 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState* old;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32881 "Photo.c"
+#line 32896 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32885 "Photo.c"
+#line 32900 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32891 "Photo.c"
+#line 32906 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 32901 "Photo.c"
+#line 32916 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32908 "Photo.c"
+#line 32923 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) {
 	PhotoReimportMasterState * self;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 32918 "Photo.c"
+#line 32933 "Photo.c"
 }
 
 
@@ -32940,24 +32955,24 @@ GType photo_reimport_master_state_get_type (void) {
 gpointer photo_reimport_master_state_ref (gpointer instance) {
 	PhotoReimportMasterState* self;
 	self = instance;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32943 "Photo.c"
+#line 32958 "Photo.c"
 }
 
 
 void photo_reimport_master_state_unref (gpointer instance) {
 	PhotoReimportMasterState* self;
 	self = instance;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32956 "Photo.c"
+#line 32971 "Photo.c"
 	}
 }
 
@@ -32965,21 +32980,21 @@ void photo_reimport_master_state_unref (gpointer instance) {
 static gchar** _vala_array_dup28 (gchar** self, int length) {
 	gchar** result;
 	int i;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = g_new0 (gchar*, length + 1);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	for (i = 0; i < length; i++) {
-#line 32968 "Photo.c"
+#line 32983 "Photo.c"
 		gchar* _tmp0_ = NULL;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = g_strdup (self[i]);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		result[i] = _tmp0_;
-#line 32974 "Photo.c"
+#line 32989 "Photo.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32978 "Photo.c"
+#line 32993 "Photo.c"
 }
 
 
@@ -32993,91 +33008,91 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 	gint _tmp4__length1 = 0;
 	gchar** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _photo_row_ref0 (_tmp0_);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp1_;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = alterations;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4__length1 = alterations_length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5__length1 = _tmp4__length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = _tmp5_;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations_length1 = _tmp5__length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->_alterations_size_ = self->alterations_length1;
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33032 "Photo.c"
+#line 33047 "Photo.c"
 }
 
 
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1);
-#line 33039 "Photo.c"
+#line 33054 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) {
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33048 "Photo.c"
+#line 33063 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) {
 	PhotoRow* _tmp0_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_row_new ();
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp0_;
-#line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33060 "Photo.c"
+#line 33075 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj) {
 	PhotoReimportMasterStateImpl * self;
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl);
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33076 "Photo.c"
+#line 33091 "Photo.c"
 }
 
 
@@ -33095,217 +33110,217 @@ static GType photo_reimport_master_state_impl_get_type (void) {
 
 PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) {
 	PhotoReimportEditableState* self = NULL;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33098 "Photo.c"
+#line 33113 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_init (GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33105 "Photo.c"
+#line 33120 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_free_value (GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33114 "Photo.c"
+#line 33129 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer);
-#line 33124 "Photo.c"
+#line 33139 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33128 "Photo.c"
+#line 33143 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33136 "Photo.c"
+#line 33151 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33143 "Photo.c"
+#line 33158 "Photo.c"
 		PhotoReimportEditableState* object;
 		object = collect_values[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33150 "Photo.c"
+#line 33165 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33154 "Photo.c"
+#line 33169 "Photo.c"
 		}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33158 "Photo.c"
+#line 33173 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33162 "Photo.c"
+#line 33177 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33166 "Photo.c"
+#line 33181 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportEditableState** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33177 "Photo.c"
+#line 33192 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33183 "Photo.c"
+#line 33198 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33187 "Photo.c"
+#line 33202 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33191 "Photo.c"
+#line 33206 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33195 "Photo.c"
+#line 33210 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportEditableState* spec;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33209 "Photo.c"
+#line 33224 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_editable_state (const GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33218 "Photo.c"
+#line 33233 "Photo.c"
 }
 
 
 void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState* old;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33238 "Photo.c"
+#line 33253 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33242 "Photo.c"
+#line 33257 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33248 "Photo.c"
+#line 33263 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState* old;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33267 "Photo.c"
+#line 33282 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33271 "Photo.c"
+#line 33286 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33277 "Photo.c"
+#line 33292 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33287 "Photo.c"
+#line 33302 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33294 "Photo.c"
+#line 33309 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj) {
 	PhotoReimportEditableState * self;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33304 "Photo.c"
+#line 33319 "Photo.c"
 }
 
 
@@ -33326,24 +33341,24 @@ GType photo_reimport_editable_state_get_type (void) {
 gpointer photo_reimport_editable_state_ref (gpointer instance) {
 	PhotoReimportEditableState* self;
 	self = instance;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33329 "Photo.c"
+#line 33344 "Photo.c"
 }
 
 
 void photo_reimport_editable_state_unref (gpointer instance) {
 	PhotoReimportEditableState* self;
 	self = instance;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33342 "Photo.c"
+#line 33357 "Photo.c"
 	}
 }
 
@@ -33354,73 +33369,73 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	BackingPhotoRow* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoMetadata* _tmp3_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL);
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_state;
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_state = _tmp1_;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33377 "Photo.c"
+#line 33392 "Photo.c"
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33384 "Photo.c"
+#line 33399 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) {
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33393 "Photo.c"
+#line 33408 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) {
 	BackingPhotoRow* _tmp0_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->backing_state = _tmp0_;
 #line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->backing_state = _tmp0_;
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33405 "Photo.c"
+#line 33420 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj) {
 	PhotoReimportEditableStateImpl * self;
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl);
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33419 "Photo.c"
+#line 33434 "Photo.c"
 }
 
 
@@ -33438,217 +33453,217 @@ static GType photo_reimport_editable_state_impl_get_type (void) {
 
 PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type) {
 	PhotoReimportRawDevelopmentState* self = NULL;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33441 "Photo.c"
+#line 33456 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_init (GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33448 "Photo.c"
+#line 33463 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_free_value (GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33457 "Photo.c"
+#line 33472 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer);
-#line 33467 "Photo.c"
+#line 33482 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33471 "Photo.c"
+#line 33486 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33479 "Photo.c"
+#line 33494 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33486 "Photo.c"
+#line 33501 "Photo.c"
 		PhotoReimportRawDevelopmentState* object;
 		object = collect_values[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33493 "Photo.c"
+#line 33508 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33497 "Photo.c"
+#line 33512 "Photo.c"
 		}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33501 "Photo.c"
+#line 33516 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33505 "Photo.c"
+#line 33520 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33509 "Photo.c"
+#line 33524 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportRawDevelopmentState** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33520 "Photo.c"
+#line 33535 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33526 "Photo.c"
+#line 33541 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33530 "Photo.c"
+#line 33545 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33534 "Photo.c"
+#line 33549 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33538 "Photo.c"
+#line 33553 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportRawDevelopmentState* spec;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33552 "Photo.c"
+#line 33567 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33561 "Photo.c"
+#line 33576 "Photo.c"
 }
 
 
 void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState* old;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33581 "Photo.c"
+#line 33596 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33585 "Photo.c"
+#line 33600 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33591 "Photo.c"
+#line 33606 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState* old;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33610 "Photo.c"
+#line 33625 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33614 "Photo.c"
+#line 33629 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33620 "Photo.c"
+#line 33635 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33630 "Photo.c"
+#line 33645 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33637 "Photo.c"
+#line 33652 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj) {
 	PhotoReimportRawDevelopmentState * self;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33647 "Photo.c"
+#line 33662 "Photo.c"
 }
 
 
@@ -33669,42 +33684,42 @@ GType photo_reimport_raw_development_state_get_type (void) {
 gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
 	PhotoReimportRawDevelopmentState* self;
 	self = instance;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33672 "Photo.c"
+#line 33687 "Photo.c"
 }
 
 
 void photo_reimport_raw_development_state_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentState* self;
 	self = instance;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33685 "Photo.c"
+#line 33700 "Photo.c"
 	}
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) {
 	PhotoReimportRawDevelopmentStateImpl* self = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33696 "Photo.c"
+#line 33711 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33703 "Photo.c"
+#line 33718 "Photo.c"
 }
 
 
@@ -33714,27 +33729,27 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_ = NULL;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self));
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (backing));
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_);
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_collection_add (_tmp0_, _tmp4_);
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33733 "Photo.c"
+#line 33748 "Photo.c"
 }
 
 
@@ -33743,19 +33758,19 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
 	GeeCollection* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0);
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33754 "Photo.c"
+#line 33769 "Photo.c"
 }
 
 
@@ -33765,253 +33780,253 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	BackingPhotoRow* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoMetadata* _tmp3_ = NULL;
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL);
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing;
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp1_;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33788 "Photo.c"
+#line 33803 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) {
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata);
-#line 33795 "Photo.c"
+#line 33810 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33802 "Photo.c"
+#line 33817 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33811 "Photo.c"
+#line 33826 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer);
-#line 33821 "Photo.c"
+#line 33836 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33825 "Photo.c"
+#line 33840 "Photo.c"
 	}
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33833 "Photo.c"
+#line 33848 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33840 "Photo.c"
+#line 33855 "Photo.c"
 		PhotoReimportRawDevelopmentStateImplDevToReimport* object;
 		object = collect_values[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33847 "Photo.c"
+#line 33862 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33851 "Photo.c"
+#line 33866 "Photo.c"
 		}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33855 "Photo.c"
+#line 33870 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33859 "Photo.c"
+#line 33874 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33863 "Photo.c"
+#line 33878 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33874 "Photo.c"
+#line 33889 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33880 "Photo.c"
+#line 33895 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33884 "Photo.c"
+#line 33899 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 33888 "Photo.c"
+#line 33903 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33892 "Photo.c"
+#line 33907 "Photo.c"
 }
 
 
 static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport* spec;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33906 "Photo.c"
+#line 33921 "Photo.c"
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33915 "Photo.c"
+#line 33930 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 33935 "Photo.c"
+#line 33950 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33939 "Photo.c"
+#line 33954 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33945 "Photo.c"
+#line 33960 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33964 "Photo.c"
+#line 33979 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33968 "Photo.c"
+#line 33983 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33974 "Photo.c"
+#line 33989 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 33984 "Photo.c"
+#line 33999 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) {
 	BackingPhotoRow* _tmp0_ = NULL;
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp0_;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33996 "Photo.c"
+#line 34011 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 34010 "Photo.c"
+#line 34025 "Photo.c"
 }
 
 
@@ -34032,58 +34047,58 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void)
 static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* self;
 	self = instance;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34035 "Photo.c"
+#line 34050 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* self;
 	self = instance;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 34048 "Photo.c"
+#line 34063 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) {
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34058 "Photo.c"
+#line 34073 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
 	GeeArrayList* _tmp0_ = NULL;
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 34070 "Photo.c"
+#line 34085 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj) {
 	PhotoReimportRawDevelopmentStateImpl * self;
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl);
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->list);
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34082 "Photo.c"
+#line 34097 "Photo.c"
 }
 
 
@@ -34226,7 +34241,7 @@ static void photo_class_init (PhotoClass * klass) {
 	g_signal_new ("source_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 326 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_rec_mutex_init (&__lock_photo_source_pixbuf_cache);
-#line 34225 "Photo.c"
+#line 34240 "Photo.c"
 }
 
 
@@ -34237,7 +34252,7 @@ static void photo_dateable_interface_init (DateableIface * iface) {
 	iface->get_exposure_time = (time_t (*)(Dateable*)) photo_real_get_exposure_time;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_exposure_time = (void (*)(Dateable*, time_t)) photo_real_set_exposure_time;
-#line 34236 "Photo.c"
+#line 34251 "Photo.c"
 }
 
 
@@ -34280,7 +34295,7 @@ static void photo_instance_init (Photo * self) {
 	self->priv->developments = NULL;
 #line 353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_photo_row = NULL;
-#line 34279 "Photo.c"
+#line 34294 "Photo.c"
 }
 
 
@@ -34320,7 +34335,7 @@ static void photo_finalize (GObject* obj) {
 	_backing_photo_row_unref0 (self->backing_photo_row);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_parent_class)->finalize (obj);
-#line 34319 "Photo.c"
+#line 34334 "Photo.c"
 }
 
 
@@ -34343,13 +34358,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34342 "Photo.c"
+#line 34357 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34348 "Photo.c"
+#line 34363 "Photo.c"
 	}
 }
 
@@ -34359,13 +34374,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34358 "Photo.c"
+#line 34373 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34364 "Photo.c"
+#line 34379 "Photo.c"
 	}
 }
 
@@ -34385,71 +34400,71 @@ GType library_photo_source_collection_state_get_type (void) {
 static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	guint result;
 	result = file_hash ((GFile*) v);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34386 "Photo.c"
+#line 34401 "Photo.c"
 }
 
 
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34395 "Photo.c"
+#line 34410 "Photo.c"
 }
 
 
 static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = int64_compare ((gint64*) a, (gint64*) b);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34404 "Photo.c"
+#line 34419 "Photo.c"
 }
 
 
 static gint64* _int64_dup (gint64* self) {
 	gint64* dup;
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (gint64, 1);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (gint64));
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34416 "Photo.c"
+#line 34431 "Photo.c"
 }
 
 
 static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = int64_equal ((gint64*) a, (gint64*) b);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34425 "Photo.c"
+#line 34440 "Photo.c"
 }
 
 
 static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = photo_get_photo_key (source);
-#line 4488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34434 "Photo.c"
+#line 34449 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34441 "Photo.c"
+#line 34456 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34448 "Photo.c"
+#line 34463 "Photo.c"
 }
 
 
@@ -34459,43 +34474,43 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 4488 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL);
 #line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL);
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 34478 "Photo.c"
+#line 34493 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
-#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34485 "Photo.c"
+#line 34500 "Photo.c"
 }
 
 
 static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34494 "Photo.c"
+#line 34509 "Photo.c"
 }
 
 
@@ -34503,24 +34518,24 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
-#line 4494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34510 "Photo.c"
+#line 34525 "Photo.c"
 }
 
 
 static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34519 "Photo.c"
+#line 34534 "Photo.c"
 }
 
 
@@ -34528,15 +34543,15 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
-#line 4498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4500 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34535 "Photo.c"
+#line 34550 "Photo.c"
 }
 
 
@@ -34546,23 +34561,23 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
 	Workers* _tmp0_ = NULL;
 	GCancellable* _tmp1_ = NULL;
 	PhotoMonitor* _tmp2_ = NULL;
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = workers;
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = cancellable;
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_monitor_new (_tmp0_, _tmp1_);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34561 "Photo.c"
+#line 34576 "Photo.c"
 }
 
 
@@ -34570,17 +34585,17 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 4506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34579 "Photo.c"
+#line 34594 "Photo.c"
 }
 
 
@@ -34588,15 +34603,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	LibraryPhotoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 4510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34595 "Photo.c"
+#line 34610 "Photo.c"
 }
 
 
@@ -34605,33 +34620,33 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_file_format_is_file_supported (_tmp0_);
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34616 "Photo.c"
+#line 34631 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34623 "Photo.c"
+#line 34638 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34630 "Photo.c"
+#line 34645 "Photo.c"
 }
 
 
@@ -34641,30 +34656,30 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	GeeIterable* _tmp75_ = NULL;
 	GeeIterable* _tmp153_ = NULL;
 	GeeIterable* _tmp154_ = NULL;
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
 #line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
+#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 34650 "Photo.c"
+#line 34665 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp2_;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 34663 "Photo.c"
+#line 34678 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -34706,80 +34721,80 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp56_ = NULL;
 				GeeCollection* _tmp57_ = NULL;
 				GeeCollection* _tmp58_ = NULL;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _object_it;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 34713 "Photo.c"
+#line 34728 "Photo.c"
 				}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp6_;
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = object;
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo = _tmp8_;
 #line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo = _tmp8_;
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp10_;
-#line 4525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = editable;
-#line 4525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != NULL) {
-#line 34737 "Photo.c"
+#line 34752 "Photo.c"
 					GeeHashMap* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->by_editable_file;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = editable;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_);
-#line 34749 "Photo.c"
+#line 34764 "Photo.c"
 				}
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
 #line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = photo;
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo));
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp17_;
-#line 4530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = raw_list;
-#line 4530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp18_ != NULL) {
-#line 34765 "Photo.c"
+#line 34780 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp19_ = NULL;
 						GeeIterator* _tmp20_ = NULL;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = raw_list;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp20_;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34778 "Photo.c"
+#line 34793 "Photo.c"
 							GeeIterator* _tmp21_ = NULL;
 							gboolean _tmp22_ = FALSE;
 							GFile* f = NULL;
@@ -34788,163 +34803,163 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							GeeHashMap* _tmp25_ = NULL;
 							GFile* _tmp26_ = NULL;
 							LibraryPhoto* _tmp27_ = NULL;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = _f_it;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = gee_iterator_next (_tmp21_);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp22_) {
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34795 "Photo.c"
+#line 34810 "Photo.c"
 							}
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = gee_iterator_get (_tmp23_);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp24_;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->by_raw_development_file;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = f;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 34813 "Photo.c"
+#line 34828 "Photo.c"
 						}
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34817 "Photo.c"
+#line 34832 "Photo.c"
 					}
 				}
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = photo;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
 #line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = photo;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo));
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = _tmp30_;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = _tmp31_->filesize;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp31_);
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp33_;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_ != NULL;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp37_);
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp38_) {
-#line 34850 "Photo.c"
+#line 34865 "Photo.c"
 					LibraryPhoto* _tmp39_ = NULL;
 					BackingPhotoRow* _tmp40_ = NULL;
 					BackingPhotoRow* _tmp41_ = NULL;
 					gint64 _tmp42_ = 0LL;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo));
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = _tmp40_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->filesize;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = _tmp42_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp41_);
-#line 34867 "Photo.c"
+#line 34882 "Photo.c"
 				} else {
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34871 "Photo.c"
+#line 34886 "Photo.c"
 				}
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = self->priv->filesize_to_photo;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = master_filesize;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_);
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = self->priv->photo_to_master_filesize;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = photo;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = master_filesize;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp47_, &_tmp48_);
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = editable_filesize;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_ >= ((gint64) 0)) {
-#line 34895 "Photo.c"
+#line 34910 "Photo.c"
 					GeeMultiMap* _tmp50_ = NULL;
 					gint64 _tmp51_ = 0LL;
 					LibraryPhoto* _tmp52_ = NULL;
 					GeeHashMap* _tmp53_ = NULL;
 					LibraryPhoto* _tmp54_ = NULL;
 					gint64 _tmp55_ = 0LL;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->filesize_to_photo;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = editable_filesize;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = photo;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_);
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = self->priv->photo_to_editable_filesize;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = photo;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = editable_filesize;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_);
-#line 34918 "Photo.c"
+#line 34933 "Photo.c"
 				}
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo));
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp57_;
-#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = raw_rows;
-#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp58_ != NULL) {
-#line 34930 "Photo.c"
+#line 34945 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp59_ = NULL;
 						GeeIterator* _tmp60_ = NULL;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = raw_rows;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp60_;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34943 "Photo.c"
+#line 34958 "Photo.c"
 							GeeIterator* _tmp61_ = NULL;
 							gboolean _tmp62_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -34952,29 +34967,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp64_ = NULL;
 							BackingPhotoRow* _tmp65_ = NULL;
 							gint64 _tmp66_ = 0LL;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp61_ = _row_it;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp62_ = gee_iterator_next (_tmp61_);
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp62_) {
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34959 "Photo.c"
+#line 34974 "Photo.c"
 							}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp64_ = gee_iterator_get (_tmp63_);
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp64_;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp65_ = row;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp66_ = _tmp65_->filesize;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp66_ >= ((gint64) 0)) {
-#line 34973 "Photo.c"
+#line 34988 "Photo.c"
 								GeeMultiMap* _tmp67_ = NULL;
 								BackingPhotoRow* _tmp68_ = NULL;
 								gint64 _tmp69_ = 0LL;
@@ -34983,72 +34998,72 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp72_ = NULL;
 								BackingPhotoRow* _tmp73_ = NULL;
 								gint64 _tmp74_ = 0LL;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp67_ = self->priv->filesize_to_photo;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp68_ = row;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp69_ = _tmp68_->filesize;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp70_ = photo;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_);
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp71_ = self->priv->photo_to_raw_development_filesize;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp72_ = photo;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp73_ = row;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp74_ = _tmp73_->filesize;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35002 "Photo.c"
+#line 35017 "Photo.c"
 							}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35006 "Photo.c"
+#line 35021 "Photo.c"
 						}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35010 "Photo.c"
+#line 35025 "Photo.c"
 					}
 				}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35023 "Photo.c"
+#line 35038 "Photo.c"
 			}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35027 "Photo.c"
+#line 35042 "Photo.c"
 		}
 	}
-#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = removed;
-#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_ != NULL) {
-#line 35034 "Photo.c"
+#line 35049 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp76_ = NULL;
 			GeeIterator* _tmp77_ = NULL;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = removed;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterable_iterator (_tmp76_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp77_;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35047 "Photo.c"
+#line 35062 "Photo.c"
 				GeeIterator* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
 				DataObject* object = NULL;
@@ -35091,39 +35106,39 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp134_ = NULL;
 				GeeCollection* _tmp135_ = NULL;
 				GeeCollection* _tmp136_ = NULL;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = _object_it;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = gee_iterator_next (_tmp78_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp79_) {
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35098 "Photo.c"
+#line 35113 "Photo.c"
 				}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp81_ = gee_iterator_get (_tmp80_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp81_;
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp82_ = object;
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo = _tmp83_;
 #line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo = _tmp83_;
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp84_ = photo;
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo));
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp85_;
-#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp86_ = editable;
-#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp86_ != NULL) {
-#line 35122 "Photo.c"
+#line 35137 "Photo.c"
 					gboolean is_removed = FALSE;
 					GeeHashMap* _tmp87_ = NULL;
 					LibraryPhoto* _tmp88_ = NULL;
@@ -35132,58 +35147,58 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					gboolean _tmp91_ = FALSE;
 					gboolean _tmp92_ = FALSE;
 					gboolean _tmp93_ = FALSE;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = self->priv->by_editable_file;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = photo;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo));
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _tmp89_;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp91_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL);
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp90_);
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_removed = _tmp92_;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = is_removed;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 					_vala_assert (_tmp93_, "is_removed");
-#line 35151 "Photo.c"
+#line 35166 "Photo.c"
 				}
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE);
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
 #line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = photo;
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo));
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp97_;
-#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = raw_list;
-#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp98_ != NULL) {
-#line 35169 "Photo.c"
+#line 35184 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp99_ = NULL;
 						GeeIterator* _tmp100_ = NULL;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp99_ = raw_list;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp100_;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35182 "Photo.c"
+#line 35197 "Photo.c"
 							GeeIterator* _tmp101_ = NULL;
 							gboolean _tmp102_ = FALSE;
 							GFile* f = NULL;
@@ -35191,158 +35206,158 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp104_ = NULL;
 							GeeHashMap* _tmp105_ = NULL;
 							GFile* _tmp106_ = NULL;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp101_ = _f_it;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp102_ = gee_iterator_next (_tmp101_);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp102_) {
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35198 "Photo.c"
+#line 35213 "Photo.c"
 							}
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp104_ = gee_iterator_get (_tmp103_);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp104_;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp105_ = self->priv->by_raw_development_file;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp106_ = f;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 35214 "Photo.c"
+#line 35229 "Photo.c"
 						}
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35218 "Photo.c"
+#line 35233 "Photo.c"
 					}
 				}
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = photo;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE);
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
 #line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp109_ = photo;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo));
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = _tmp110_;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp111_->filesize;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp113_ = _tmp112_;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp111_);
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp113_;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = photo;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo));
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp118_ = _tmp117_ != NULL;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp117_);
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp118_) {
-#line 35253 "Photo.c"
+#line 35268 "Photo.c"
 					LibraryPhoto* _tmp119_ = NULL;
 					BackingPhotoRow* _tmp120_ = NULL;
 					BackingPhotoRow* _tmp121_ = NULL;
 					gint64 _tmp122_ = 0LL;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = photo;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo));
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = _tmp120_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = _tmp121_->filesize;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = _tmp122_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp121_);
-#line 35270 "Photo.c"
+#line 35285 "Photo.c"
 				} else {
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35274 "Photo.c"
+#line 35289 "Photo.c"
 				}
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp123_ = self->priv->filesize_to_photo;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp124_ = master_filesize;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp125_ = photo;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_);
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp126_ = self->priv->photo_to_master_filesize;
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp127_ = photo;
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp127_, NULL);
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp128_ = editable_filesize;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp128_ >= ((gint64) 0)) {
-#line 35296 "Photo.c"
+#line 35311 "Photo.c"
 					GeeMultiMap* _tmp129_ = NULL;
 					gint64 _tmp130_ = 0LL;
 					LibraryPhoto* _tmp131_ = NULL;
 					GeeHashMap* _tmp132_ = NULL;
 					LibraryPhoto* _tmp133_ = NULL;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp129_ = self->priv->filesize_to_photo;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp130_ = editable_filesize;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp131_ = photo;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_);
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp132_ = self->priv->photo_to_editable_filesize;
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp133_ = photo;
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL);
-#line 35316 "Photo.c"
+#line 35331 "Photo.c"
 				}
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo));
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp135_;
-#line 4587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp136_ = raw_rows;
-#line 4587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp136_ != NULL) {
-#line 35328 "Photo.c"
+#line 35343 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp137_ = NULL;
 						GeeIterator* _tmp138_ = NULL;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp137_ = raw_rows;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp138_;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35341 "Photo.c"
+#line 35356 "Photo.c"
 							GeeIterator* _tmp139_ = NULL;
 							gboolean _tmp140_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -35350,29 +35365,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp142_ = NULL;
 							BackingPhotoRow* _tmp143_ = NULL;
 							gint64 _tmp144_ = 0LL;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp139_ = _row_it;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp140_ = gee_iterator_next (_tmp139_);
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp140_) {
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35357 "Photo.c"
+#line 35372 "Photo.c"
 							}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp142_ = gee_iterator_get (_tmp141_);
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp142_;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp143_ = row;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp144_ = _tmp143_->filesize;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp144_ >= ((gint64) 0)) {
-#line 35371 "Photo.c"
+#line 35386 "Photo.c"
 								GeeMultiMap* _tmp145_ = NULL;
 								BackingPhotoRow* _tmp146_ = NULL;
 								gint64 _tmp147_ = 0LL;
@@ -35381,116 +35396,116 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp150_ = NULL;
 								BackingPhotoRow* _tmp151_ = NULL;
 								gint64 _tmp152_ = 0LL;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp145_ = self->priv->filesize_to_photo;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp146_ = row;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp147_ = _tmp146_->filesize;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp148_ = photo;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_);
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp149_ = self->priv->photo_to_raw_development_filesize;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp150_ = photo;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp151_ = row;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp152_ = _tmp151_->filesize;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35400 "Photo.c"
+#line 35415 "Photo.c"
 							}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35404 "Photo.c"
+#line 35419 "Photo.c"
 						}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35408 "Photo.c"
+#line 35423 "Photo.c"
 					}
 				}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35421 "Photo.c"
+#line 35436 "Photo.c"
 			}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35425 "Photo.c"
+#line 35440 "Photo.c"
 		}
 	}
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = added;
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = removed;
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_);
-#line 35434 "Photo.c"
+#line 35449 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) {
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp5_ = NULL;
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = old_file;
-#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 35453 "Photo.c"
+#line 35468 "Photo.c"
 		gboolean is_removed = FALSE;
 		GeeHashMap* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->priv->by_editable_file;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = old_file;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL);
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_removed = _tmp3_;
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = is_removed;
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp4_, "is_removed");
-#line 35471 "Photo.c"
+#line 35486 "Photo.c"
 	}
-#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = new_file;
-#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 35477 "Photo.c"
+#line 35492 "Photo.c"
 		GeeHashMap* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->by_editable_file;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = new_file;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 35489 "Photo.c"
+#line 35504 "Photo.c"
 	}
 }
 
@@ -35511,35 +35526,35 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	LibraryPhoto* _tmp35_ = NULL;
 	GeeCollection* _tmp36_ = NULL;
 	GeeCollection* _tmp37_ = NULL;
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 35528 "Photo.c"
+#line 35543 "Photo.c"
 	}
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 35538 "Photo.c"
+#line 35553 "Photo.c"
 		GeeMultiMap* _tmp21_ = NULL;
 		LibraryPhoto* _tmp22_ = NULL;
 		{
@@ -35550,25 +35565,25 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->photo_to_raw_development_filesize;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_s_it = _tmp11_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35567 "Photo.c"
+#line 35582 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				gint64 s = 0LL;
@@ -35579,74 +35594,74 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeMultiMap* _tmp18_ = NULL;
 				gint64 _tmp19_ = 0LL;
 				LibraryPhoto* _tmp20_ = NULL;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _s_it;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35586 "Photo.c"
+#line 35601 "Photo.c"
 				}
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = (gint64*) _tmp15_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *_tmp16_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp16_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				s = _tmp17_;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->priv->filesize_to_photo;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = s;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = photo;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35608 "Photo.c"
+#line 35623 "Photo.c"
 			}
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35612 "Photo.c"
+#line 35627 "Photo.c"
 		}
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = photo;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35620 "Photo.c"
+#line 35635 "Photo.c"
 	}
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp24_;
-#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = raw_list;
-#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_ != NULL) {
-#line 35632 "Photo.c"
+#line 35647 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp26_ = NULL;
 			GeeIterator* _tmp27_ = NULL;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = raw_list;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp27_;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35645 "Photo.c"
+#line 35660 "Photo.c"
 				GeeIterator* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
 				GFile* f = NULL;
@@ -35655,63 +35670,63 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeHashMap* _tmp32_ = NULL;
 				GFile* _tmp33_ = NULL;
 				LibraryPhoto* _tmp34_ = NULL;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _f_it;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = gee_iterator_next (_tmp28_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp29_) {
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35662 "Photo.c"
+#line 35677 "Photo.c"
 				}
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = gee_iterator_get (_tmp30_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp31_;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->by_raw_development_file;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = f;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = photo;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 35680 "Photo.c"
+#line 35695 "Photo.c"
 			}
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35684 "Photo.c"
+#line 35699 "Photo.c"
 		}
 	}
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rows = _tmp36_;
-#line 4630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = raw_rows;
-#line 4630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_ != NULL) {
-#line 35697 "Photo.c"
+#line 35712 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp38_ = NULL;
 			GeeIterator* _tmp39_ = NULL;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = raw_rows;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp39_;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35710 "Photo.c"
+#line 35725 "Photo.c"
 				GeeIterator* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -35719,29 +35734,29 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				gpointer _tmp43_ = NULL;
 				BackingPhotoRow* _tmp44_ = NULL;
 				gint64 _tmp45_ = 0LL;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _row_it;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_iterator_next (_tmp40_);
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp41_) {
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35726 "Photo.c"
+#line 35741 "Photo.c"
 				}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = gee_iterator_get (_tmp42_);
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp43_;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = row;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_->filesize;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp45_ > ((gint64) 0)) {
-#line 35740 "Photo.c"
+#line 35755 "Photo.c"
 					GeeMultiMap* _tmp46_ = NULL;
 					BackingPhotoRow* _tmp47_ = NULL;
 					gint64 _tmp48_ = 0LL;
@@ -35750,62 +35765,62 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 					LibraryPhoto* _tmp51_ = NULL;
 					BackingPhotoRow* _tmp52_ = NULL;
 					gint64 _tmp53_ = 0LL;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp46_ = self->priv->filesize_to_photo;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp47_ = row;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp48_ = _tmp47_->filesize;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = photo;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_);
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->photo_to_raw_development_filesize;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = photo;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = row;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = _tmp52_->filesize;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35769 "Photo.c"
+#line 35784 "Photo.c"
 				}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35773 "Photo.c"
+#line 35788 "Photo.c"
 			}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35777 "Photo.c"
+#line 35792 "Photo.c"
 		}
 	}
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_rows);
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 35786 "Photo.c"
+#line 35801 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35793 "Photo.c"
+#line 35808 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) {
 	LibraryPhotoSourceCollection * self;
 	GeeMap* _tmp72_ = NULL;
-#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 35804 "Photo.c"
+#line 35819 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -35814,25 +35829,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = items;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_object_it = _tmp5_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 35831 "Photo.c"
+#line 35846 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -35848,59 +35863,59 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			gboolean _tmp15_ = FALSE;
 			Alteration* _tmp16_ = NULL;
 			gboolean _tmp17_ = FALSE;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _object_it;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35855 "Photo.c"
+#line 35870 "Photo.c"
 			}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			object = (DataObject*) _tmp9_;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = items;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = object;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
-			alteration = (Alteration*) _tmp12_;
 #line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+			alteration = (Alteration*) _tmp12_;
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = object;
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo = _tmp14_;
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo = _tmp14_;
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = alteration;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = alteration_has_detail (_tmp16_, "image", "master");
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp17_) {
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 35885 "Photo.c"
+#line 35900 "Photo.c"
 			} else {
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = alteration;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 35895 "Photo.c"
+#line 35910 "Photo.c"
 			}
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 35899 "Photo.c"
+#line 35914 "Photo.c"
 				gint64 old_master_filesize = 0LL;
 				GeeHashMap* _tmp20_ = NULL;
 				LibraryPhoto* _tmp21_ = NULL;
@@ -35937,215 +35952,215 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				gint64 _tmp63_ = 0LL;
 				LibraryPhoto* _tmp64_ = NULL;
 				gint64 _tmp65_ = 0LL;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->priv->photo_to_master_filesize;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = photo;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_);
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = (gint64*) _tmp22_;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = *_tmp23_;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp23_);
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_master_filesize = _tmp24_;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = self->priv->photo_to_editable_filesize;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = photo;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 35958 "Photo.c"
+#line 35973 "Photo.c"
 					GeeHashMap* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 					gpointer _tmp31_ = NULL;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->priv->photo_to_editable_filesize;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_);
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = (gint64*) _tmp31_;
-#line 35972 "Photo.c"
+#line 35987 "Photo.c"
 				} else {
 					gint64 _tmp32_ = 0LL;
 					gint64* _tmp33_ = NULL;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = (gint64) -1;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = __int64_dup0 (&_tmp32_);
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = _tmp33_;
-#line 35984 "Photo.c"
+#line 35999 "Photo.c"
 				}
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = self->priv->photo_to_master_filesize;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL);
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = self->priv->filesize_to_photo;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = old_master_filesize;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_);
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = old_editable_filesize;
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp39_ >= ((gint64) 0)) {
-#line 36006 "Photo.c"
+#line 36021 "Photo.c"
 					GeeHashMap* _tmp40_ = NULL;
 					LibraryPhoto* _tmp41_ = NULL;
 					GeeMultiMap* _tmp42_ = NULL;
 					gint64 _tmp43_ = 0LL;
 					LibraryPhoto* _tmp44_ = NULL;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->photo_to_editable_filesize;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = photo;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, NULL);
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = self->priv->filesize_to_photo;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp43_ = old_editable_filesize;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp44_ = photo;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36026 "Photo.c"
+#line 36041 "Photo.c"
 				}
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo));
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _tmp47_->filesize;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp47_);
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp49_;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = photo;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo));
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = _tmp52_;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp54_ = _tmp53_ != NULL;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp53_);
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp54_) {
-#line 36054 "Photo.c"
+#line 36069 "Photo.c"
 					LibraryPhoto* _tmp55_ = NULL;
 					BackingPhotoRow* _tmp56_ = NULL;
 					BackingPhotoRow* _tmp57_ = NULL;
 					gint64 _tmp58_ = 0LL;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = photo;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo));
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = _tmp56_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = _tmp57_->filesize;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = _tmp58_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp57_);
-#line 36071 "Photo.c"
+#line 36086 "Photo.c"
 				} else {
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36075 "Photo.c"
+#line 36090 "Photo.c"
 				}
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->photo_to_master_filesize;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = master_filesize;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, &_tmp61_);
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = self->priv->filesize_to_photo;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = master_filesize;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = photo;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_);
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = editable_filesize;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp65_ >= ((gint64) 0)) {
-#line 36099 "Photo.c"
+#line 36114 "Photo.c"
 					GeeHashMap* _tmp66_ = NULL;
 					LibraryPhoto* _tmp67_ = NULL;
 					gint64 _tmp68_ = 0LL;
 					GeeMultiMap* _tmp69_ = NULL;
 					gint64 _tmp70_ = 0LL;
 					LibraryPhoto* _tmp71_ = NULL;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = self->priv->photo_to_editable_filesize;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp67_ = photo;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = editable_filesize;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_, &_tmp68_);
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp69_ = self->priv->filesize_to_photo;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp70_ = editable_filesize;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp71_ = photo;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36122 "Photo.c"
+#line 36137 "Photo.c"
 				}
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36126 "Photo.c"
+#line 36141 "Photo.c"
 			}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (alteration);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (object);
-#line 36134 "Photo.c"
+#line 36149 "Photo.c"
 		}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36138 "Photo.c"
+#line 36153 "Photo.c"
 	}
-#line 4672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = items;
-#line 4672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_);
-#line 36144 "Photo.c"
+#line 36159 "Photo.c"
 }
 
 
@@ -36154,28 +36169,28 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	GeeHashMultiMap* map = NULL;
 	GeeHashMultiMap* _tmp0_ = NULL;
 	GeeCollection* _tmp97_ = NULL;
-#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
-#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 36161 "Photo.c"
+#line 36176 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_sources;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp2_;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36174 "Photo.c"
+#line 36189 "Photo.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			MediaSource* media = NULL;
@@ -36198,80 +36213,80 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			gboolean _tmp21_ = FALSE;
 			PhotoMetadata* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _media_it;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp4_) {
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36205 "Photo.c"
+#line 36220 "Photo.c"
 			}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp6_;
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = media;
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp8_;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = photo;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			metadata = _tmp10_;
-#line 4683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 4683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 			global_index = _tmp11_;
-#line 4690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
 			htag_index = NULL;
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = metadata;
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 36237 "Photo.c"
+#line 36252 "Photo.c"
 				PhotoMetadata* _tmp14_ = NULL;
 				GeeSet* _tmp15_ = NULL;
 				GeeSet* _tmp16_ = NULL;
 				HierarchicalTagIndex* _tmp17_ = NULL;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = metadata;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_);
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_hierarchical_tag_index_unref0 (htag_index);
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				htag_index = _tmp17_;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp16_);
-#line 36256 "Photo.c"
+#line 36271 "Photo.c"
 			}
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = library_photo_get_import_keywords (_tmp18_);
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_ != NULL;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp20_);
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 36270 "Photo.c"
+#line 36285 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
 					LibraryPhoto* _tmp22_ = NULL;
@@ -36279,23 +36294,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp24_ = NULL;
 					GeeIterator* _tmp25_ = NULL;
 					GeeIterator* _tmp26_ = NULL;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = photo;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = library_photo_get_import_keywords (_tmp22_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = _tmp25_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp24_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_keyword_it = _tmp26_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36294 "Photo.c"
+#line 36309 "Photo.c"
 						GeeIterator* _tmp27_ = NULL;
 						gboolean _tmp28_ = FALSE;
 						gchar* keyword = NULL;
@@ -36310,67 +36325,67 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp39_ = NULL;
 						gboolean _tmp40_ = FALSE;
 						const gchar* _tmp49_ = NULL;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _keyword_it;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = gee_iterator_next (_tmp27_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp28_) {
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36317 "Photo.c"
+#line 36332 "Photo.c"
 						}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = gee_iterator_get (_tmp29_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						keyword = (gchar*) _tmp30_;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = htag_index;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp32_ != NULL) {
-#line 36329 "Photo.c"
+#line 36344 "Photo.c"
 							HierarchicalTagIndex* _tmp33_ = NULL;
 							const gchar* _tmp34_ = NULL;
 							gboolean _tmp35_ = FALSE;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = htag_index;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = keyword;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = _tmp35_;
-#line 36341 "Photo.c"
+#line 36356 "Photo.c"
 						} else {
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36345 "Photo.c"
+#line 36360 "Photo.c"
 						}
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36353 "Photo.c"
+#line 36368 "Photo.c"
 						}
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp37_ = tag_prep_tag_name (_tmp36_);
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
-						name = _tmp37_;
 #line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+						name = _tmp37_;
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = global_index;
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp39_ = name;
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp40_) {
-#line 36369 "Photo.c"
+#line 36384 "Photo.c"
 							gchar* most_derived_path = NULL;
 							HierarchicalTagIndex* _tmp41_ = NULL;
 							const gchar* _tmp42_ = NULL;
@@ -36380,82 +36395,82 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							Tag* _tmp46_ = NULL;
 							Tag* _tmp47_ = NULL;
 							LibraryPhoto* _tmp48_ = NULL;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp41_ = global_index;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp42_ = name;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_);
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							most_derived_path = _tmp43_;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp44_ = map;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp45_ = most_derived_path;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp46_ = tag_for_path (_tmp45_);
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp47_ = _tmp46_;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp48_ = photo;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_);
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp47_);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (most_derived_path);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (name);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36409 "Photo.c"
+#line 36424 "Photo.c"
 						}
-#line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp49_ = name;
-#line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp49_ != NULL) {
-#line 36415 "Photo.c"
+#line 36430 "Photo.c"
 							GeeHashMultiMap* _tmp50_ = NULL;
 							const gchar* _tmp51_ = NULL;
 							Tag* _tmp52_ = NULL;
 							Tag* _tmp53_ = NULL;
 							LibraryPhoto* _tmp54_ = NULL;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp50_ = map;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp51_ = name;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp52_ = tag_for_path (_tmp51_);
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp53_ = _tmp52_;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp54_ = photo;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_);
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp53_);
-#line 36435 "Photo.c"
+#line 36450 "Photo.c"
 						}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (keyword);
-#line 36441 "Photo.c"
+#line 36456 "Photo.c"
 					}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36445 "Photo.c"
+#line 36460 "Photo.c"
 				}
 			}
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = metadata;
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp56_) {
-#line 36454 "Photo.c"
+#line 36469 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
 					HierarchicalTagIndex* _tmp57_ = NULL;
@@ -36463,23 +36478,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp59_ = NULL;
 					GeeIterator* _tmp60_ = NULL;
 					GeeIterator* _tmp61_ = NULL;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = htag_index;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp59_ = _tmp58_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp60_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp59_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_path_it = _tmp61_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36478 "Photo.c"
+#line 36493 "Photo.c"
 						GeeIterator* _tmp62_ = NULL;
 						gboolean _tmp63_ = FALSE;
 						gchar* path = NULL;
@@ -36489,94 +36504,94 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						const gchar* _tmp68_ = NULL;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp62_ = _path_it;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp63_ = gee_iterator_next (_tmp62_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp63_) {
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36496 "Photo.c"
+#line 36511 "Photo.c"
 						}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp65_ = gee_iterator_get (_tmp64_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						path = (gchar*) _tmp65_;
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp66_ = path;
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = tag_prep_tag_name (_tmp66_);
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						name = _tmp67_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = name;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp68_ != NULL) {
-#line 36514 "Photo.c"
+#line 36529 "Photo.c"
 							GeeHashMultiMap* _tmp69_ = NULL;
 							const gchar* _tmp70_ = NULL;
 							Tag* _tmp71_ = NULL;
 							Tag* _tmp72_ = NULL;
 							LibraryPhoto* _tmp73_ = NULL;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp69_ = map;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp70_ = name;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp71_ = tag_for_path (_tmp70_);
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp72_ = _tmp71_;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp73_ = photo;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_);
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp72_);
-#line 36534 "Photo.c"
+#line 36549 "Photo.c"
 						}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (path);
-#line 36540 "Photo.c"
+#line 36555 "Photo.c"
 					}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36544 "Photo.c"
+#line 36559 "Photo.c"
 				}
 			}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (htag_index);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (global_index);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36557 "Photo.c"
+#line 36572 "Photo.c"
 		}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36561 "Photo.c"
+#line 36576 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp74_ = NULL;
 		GeeIterator* _tmp75_ = NULL;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = media_sources;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp75_;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36575 "Photo.c"
+#line 36590 "Photo.c"
 			GeeIterator* _tmp76_ = NULL;
 			gboolean _tmp77_ = FALSE;
 			MediaSource* media = NULL;
@@ -36586,41 +36601,41 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			MediaSource* _tmp80_ = NULL;
 			LibraryPhoto* _tmp81_ = NULL;
 			LibraryPhoto* _tmp82_ = NULL;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _media_it;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterator_next (_tmp76_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp77_) {
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36593 "Photo.c"
+#line 36608 "Photo.c"
 			}
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = gee_iterator_get (_tmp78_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp79_;
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = media;
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp81_;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = photo;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_clear_import_keywords (_tmp82_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36615 "Photo.c"
+#line 36630 "Photo.c"
 		}
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36619 "Photo.c"
+#line 36634 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
@@ -36629,23 +36644,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		GeeSet* _tmp85_ = NULL;
 		GeeIterator* _tmp86_ = NULL;
 		GeeIterator* _tmp87_ = NULL;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = map;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = _tmp86_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp85_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tag_it = _tmp87_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36644 "Photo.c"
+#line 36659 "Photo.c"
 			GeeIterator* _tmp88_ = NULL;
 			gboolean _tmp89_ = FALSE;
 			Tag* tag = NULL;
@@ -36656,155 +36671,155 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			Tag* _tmp94_ = NULL;
 			GeeCollection* _tmp95_ = NULL;
 			GeeCollection* _tmp96_ = NULL;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp88_ = _tag_it;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp89_ = gee_iterator_next (_tmp88_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp89_) {
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36663 "Photo.c"
+#line 36678 "Photo.c"
 			}
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp91_ = gee_iterator_get (_tmp90_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag = (Tag*) _tmp91_;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp92_ = tag;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp93_ = map;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = tag;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp94_);
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp96_ = _tmp95_;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag_attach_many (_tmp92_, _tmp96_);
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp96_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (tag);
-#line 36687 "Photo.c"
+#line 36702 "Photo.c"
 		}
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36691 "Photo.c"
+#line 36706 "Photo.c"
 	}
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_);
-#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map);
-#line 36699 "Photo.c"
+#line 36714 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36716 "Photo.c"
+#line 36731 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36725 "Photo.c"
+#line 36740 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36742 "Photo.c"
+#line 36757 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36751 "Photo.c"
+#line 36766 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36768 "Photo.c"
+#line 36783 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36777 "Photo.c"
+#line 36792 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36794 "Photo.c"
+#line 36809 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36803 "Photo.c"
+#line 36818 "Photo.c"
 }
 
 
@@ -36814,38 +36829,38 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
 	gint64 _tmp0_ = 0LL;
 	PhotoID _tmp1_ = {0};
 	LibraryPhoto* _tmp2_ = NULL;
-#line 4754 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = numeric_id;
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp1_, _tmp0_);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36825 "Photo.c"
+#line 36840 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36844 "Photo.c"
+#line 36859 "Photo.c"
 }
 
 
@@ -36853,40 +36868,40 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36866 "Photo.c"
+#line 36881 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36885 "Photo.c"
+#line 36900 "Photo.c"
 }
 
 
@@ -36894,21 +36909,21 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36907 "Photo.c"
+#line 36922 "Photo.c"
 }
 
 
@@ -36931,7 +36946,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 36930 "Photo.c"
+#line 36945 "Photo.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -36939,7 +36954,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36938 "Photo.c"
+#line 36953 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -36951,7 +36966,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36950 "Photo.c"
+#line 36965 "Photo.c"
 	}
 }
 
@@ -36975,21 +36990,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 36974 "Photo.c"
+#line 36989 "Photo.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 36980 "Photo.c"
+#line 36995 "Photo.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 36984 "Photo.c"
+#line 36999 "Photo.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 36988 "Photo.c"
+#line 37003 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -37001,7 +37016,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 37000 "Photo.c"
+#line 37015 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -37011,13 +37026,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 37010 "Photo.c"
+#line 37025 "Photo.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 37016 "Photo.c"
+#line 37031 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -37031,7 +37046,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37030 "Photo.c"
+#line 37045 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -37041,13 +37056,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37040 "Photo.c"
+#line 37055 "Photo.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 37046 "Photo.c"
+#line 37061 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -37056,7 +37071,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 37055 "Photo.c"
+#line 37070 "Photo.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -37076,7 +37091,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 37075 "Photo.c"
+#line 37090 "Photo.c"
 }
 
 
@@ -37092,37 +37107,37 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
 	gchar* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
 	MediaSource* _tmp7_ = NULL;
-#line 4778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source_id;
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)");
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = source_id;
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = strlen (PHOTO_TYPENAME);
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1);
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
-	numeric_only = _tmp5_;
 #line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+	numeric_only = _tmp5_;
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = parse_int64 (numeric_only, 16);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp6_);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (numeric_only);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37121 "Photo.c"
+#line 37136 "Photo.c"
 }
 
 
@@ -37134,27 +37149,27 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *event_id;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37153 "Photo.c"
+#line 37168 "Photo.c"
 }
 
 
@@ -37163,21 +37178,21 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *photo_id;
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37176 "Photo.c"
+#line 37191 "Photo.c"
 }
 
 
@@ -37186,21 +37201,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
 	GeeHashMap* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
-#line 4793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_editable_file;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37199 "Photo.c"
+#line 37214 "Photo.c"
 }
 
 
@@ -37209,21 +37224,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
 	GeeHashMap* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
-#line 4797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_raw_development_file;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37222 "Photo.c"
+#line 37237 "Photo.c"
 }
 
 
@@ -37243,110 +37258,110 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	LibraryPhoto* _tmp17_ = NULL;
 	GeeCollection* _tmp18_ = NULL;
 	GeeCollection* _tmp19_ = NULL;
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_development));
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = info;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_);
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp2_);
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 37270 "Photo.c"
+#line 37285 "Photo.c"
 		GeeCollection* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = matches_master;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37279 "Photo.c"
+#line 37294 "Photo.c"
 	}
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable = _tmp9_;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = editable;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37291 "Photo.c"
+#line 37306 "Photo.c"
 		BackingPhotoRow* _tmp12_ = NULL;
 		GFileInfo* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = editable;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = info;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp14_;
-#line 37303 "Photo.c"
+#line 37318 "Photo.c"
 	} else {
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37307 "Photo.c"
+#line 37322 "Photo.c"
 	}
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37311 "Photo.c"
+#line 37326 "Photo.c"
 		GeeCollection* _tmp15_ = NULL;
 		LibraryPhoto* _tmp16_ = NULL;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = matches_editable;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = photo;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37320 "Photo.c"
+#line 37335 "Photo.c"
 	}
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	development = _tmp18_;
-#line 4812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = development;
-#line 4812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37332 "Photo.c"
+#line 37347 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp20_ = NULL;
 			GeeIterator* _tmp21_ = NULL;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = development;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp21_;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37345 "Photo.c"
+#line 37360 "Photo.c"
 				GeeIterator* _tmp22_ = NULL;
 				gboolean _tmp23_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -37355,74 +37370,74 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				BackingPhotoRow* _tmp26_ = NULL;
 				GFileInfo* _tmp27_ = NULL;
 				gboolean _tmp28_ = FALSE;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = _row_it;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = gee_iterator_next (_tmp22_);
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp23_) {
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37362 "Photo.c"
+#line 37377 "Photo.c"
 				}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = gee_iterator_get (_tmp24_);
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp25_;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = row;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = info;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 37378 "Photo.c"
+#line 37393 "Photo.c"
 					GeeCollection* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = matches_development;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
-					gee_collection_add (_tmp29_, _tmp30_);
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+					gee_collection_add (_tmp29_, _tmp30_);
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37391 "Photo.c"
+#line 37406 "Photo.c"
 				}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37395 "Photo.c"
+#line 37410 "Photo.c"
 			}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37399 "Photo.c"
+#line 37414 "Photo.c"
 		}
 	}
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (development);
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (editable);
-#line 37406 "Photo.c"
+#line 37421 "Photo.c"
 }
 
 
 void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development) {
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37421 "Photo.c"
+#line 37436 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37432,27 +37447,27 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
 		GeeIterator* _tmp6_ = NULL;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = info;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp6_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37451 "Photo.c"
+#line 37466 "Photo.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37463,41 +37478,41 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp13_ = NULL;
 			GeeCollection* _tmp14_ = NULL;
 			GeeCollection* _tmp15_ = NULL;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _photo_it;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp8_) {
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37470 "Photo.c"
+#line 37485 "Photo.c"
 			}
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp10_;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = info;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = matches_master;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = matches_editable;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = matched_development;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37492 "Photo.c"
+#line 37507 "Photo.c"
 		}
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37496 "Photo.c"
+#line 37511 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -37505,21 +37520,21 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp17_ = NULL;
 		GeeIterator* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp17_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp19_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37518 "Photo.c"
+#line 37533 "Photo.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSource* media = NULL;
@@ -37530,52 +37545,52 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp26_ = NULL;
 			GeeCollection* _tmp27_ = NULL;
 			GeeCollection* _tmp28_ = NULL;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _media_it;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp21_) {
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37537 "Photo.c"
+#line 37552 "Photo.c"
 			}
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp23_;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = info;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = matches_master;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = matches_editable;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = matched_development;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 37559 "Photo.c"
+#line 37574 "Photo.c"
 		}
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37563 "Photo.c"
+#line 37578 "Photo.c"
 	}
 }
 
 
 void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) {
 	PhotoID _tmp19_ = {0};
-#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (basename != NULL);
-#line 37574 "Photo.c"
+#line 37589 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37584,25 +37599,25 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = filesize;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37601 "Photo.c"
+#line 37616 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37615,72 +37630,72 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37622 "Photo.c"
+#line 37637 "Photo.c"
 			}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp9_;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = basename;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp12_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp16_) {
-#line 37648 "Photo.c"
+#line 37663 "Photo.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				PhotoID _tmp18_ = {0};
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				*result = _tmp18_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_photo_it);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 37663 "Photo.c"
+#line 37678 "Photo.c"
 			}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37667 "Photo.c"
+#line 37682 "Photo.c"
 		}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37671 "Photo.c"
+#line 37686 "Photo.c"
 	}
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp19_;
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37679 "Photo.c"
+#line 37694 "Photo.c"
 }
 
 
@@ -37690,23 +37705,23 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	gint64 _tmp1_ = 0LL;
 	PhotoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 4844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = filesize;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_id_is_valid (&_tmp2_);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37705 "Photo.c"
+#line 37720 "Photo.c"
 }
 
 
@@ -37719,54 +37734,54 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
 	LibraryPhoto* _tmp5_ = NULL;
-#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37740 "Photo.c"
+#line 37755 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		LibraryPhoto* _tmp9_ = NULL;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37759 "Photo.c"
+#line 37774 "Photo.c"
 	}
-#line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37765 "Photo.c"
+#line 37780 "Photo.c"
 }
 
 
@@ -37777,27 +37792,27 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_ = NULL;
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
-#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37796 "Photo.c"
+#line 37811 "Photo.c"
 }
 
 
@@ -37810,54 +37825,54 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
 	LibraryPhoto* _tmp5_ = NULL;
-#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37831 "Photo.c"
+#line 37846 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		LibraryPhoto* _tmp9_ = NULL;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37850 "Photo.c"
+#line 37865 "Photo.c"
 	}
-#line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37856 "Photo.c"
+#line 37871 "Photo.c"
 }
 
 
@@ -37868,27 +37883,27 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_ = NULL;
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
-#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37887 "Photo.c"
+#line 37902 "Photo.c"
 }
 
 
@@ -37898,23 +37913,23 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 4874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0);
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank));
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37913 "Photo.c"
+#line 37928 "Photo.c"
 }
 
 
@@ -37939,169 +37954,169 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	LibraryPhoto* _tmp14_ = NULL;
 	LibraryPhoto* _tmp15_ = NULL;
 	LibraryPhoto* _tmp16_ = NULL;
-#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE;
 #line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE;
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37960 "Photo.c"
+#line 37975 "Photo.c"
 		}
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37964 "Photo.c"
+#line 37979 "Photo.c"
 	}
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_);
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE;
 #line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE;
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37986 "Photo.c"
+#line 38001 "Photo.c"
 		}
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37990 "Photo.c"
+#line 38005 "Photo.c"
 	}
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_);
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp7_;
-#line 4894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER;
 #line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER;
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38012 "Photo.c"
+#line 38027 "Photo.c"
 		}
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38016 "Photo.c"
+#line 38031 "Photo.c"
 	}
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_);
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL;
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ == NULL) {
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp10_);
-#line 38028 "Photo.c"
+#line 38043 "Photo.c"
 	}
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp11_;
-#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo;
-#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ != NULL) {
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH;
 #line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH;
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38046 "Photo.c"
+#line 38061 "Photo.c"
 		}
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38050 "Photo.c"
+#line 38065 "Photo.c"
 	}
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_);
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL;
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_ == NULL) {
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp14_);
-#line 38062 "Photo.c"
+#line 38077 "Photo.c"
 	}
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp15_;
-#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo;
-#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ != NULL) {
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE;
 #line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE;
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38080 "Photo.c"
+#line 38095 "Photo.c"
 		}
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38084 "Photo.c"
+#line 38099 "Photo.c"
 	}
-#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = NULL;
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 38096 "Photo.c"
+#line 38111 "Photo.c"
 	}
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38100 "Photo.c"
+#line 38115 "Photo.c"
 }
 
 
@@ -38120,67 +38135,67 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 	SourceBacklink* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
-#line 4919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE);
-#line 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backlink;
-#line 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_);
-#line 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38133 "Photo.c"
+#line 38148 "Photo.c"
 	}
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backlink;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp4_);
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 4924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38153 "Photo.c"
+#line 38168 "Photo.c"
 	}
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = backlink;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp9_);
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp8_);
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 4927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38173 "Photo.c"
+#line 38188 "Photo.c"
 	}
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38179 "Photo.c"
+#line 38194 "Photo.c"
 }
 
 
@@ -38193,35 +38208,35 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
 	MediaSourceHoldingTank* _tmp4_ = NULL;
 	SourceBacklink* _tmp5_ = NULL;
 	SourceBacklink* _tmp6_ = NULL;
-#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = backlink;
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = backlink;
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp5_);
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
-	_source_holding_tank_unref0 (_tmp4_);
 #line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+	_source_holding_tank_unref0 (_tmp4_);
+#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = backlink;
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38220 "Photo.c"
+#line 38235 "Photo.c"
 }
 
 
@@ -38230,38 +38245,38 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	LibraryPhotoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 4453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 4454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38235 "Photo.c"
+#line 38250 "Photo.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38243 "Photo.c"
+#line 38258 "Photo.c"
 	}
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38251 "Photo.c"
+#line 38266 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38260 "Photo.c"
+#line 38275 "Photo.c"
 }
 
 
@@ -38272,119 +38287,119 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = closure->data;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 38279 "Photo.c"
+#line 38294 "Photo.c"
 	} else {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 38285 "Photo.c"
+#line 38300 "Photo.c"
 	}
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2);
-#line 38291 "Photo.c"
+#line 38306 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38300 "Photo.c"
+#line 38315 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38309 "Photo.c"
+#line 38324 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38318 "Photo.c"
+#line 38333 "Photo.c"
 }
 
 
 static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->finalize = library_photo_source_collection_finalize;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate));
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = library_photo_source_collection_real_create_trashcan;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = library_photo_source_collection_real_create_offline_bin;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = library_photo_source_collection_real_create_media_monitor;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = library_photo_source_collection_real_holds_type_of_source;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = library_photo_source_collection_real_get_typename;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = library_photo_source_collection_real_is_file_recognized;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = library_photo_source_collection_real_notify_contents_altered;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->items_altered = library_photo_source_collection_real_items_altered;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = library_photo_source_collection_real_postprocess_imported_media;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = library_photo_source_collection_real_notify_master_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = library_photo_source_collection_real_notify_editable_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = library_photo_source_collection_real_notify_source_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = library_photo_source_collection_real_notify_baseline_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = library_photo_source_collection_real_fetch_by_numeric_id;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = library_photo_source_collection_real_fetch_by_source_id;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = library_photo_source_collection_real_get_event_source_ids;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->has_backlink = library_photo_source_collection_real_has_backlink;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->remove_backlink = library_photo_source_collection_real_remove_backlink;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->editable_reimported = library_photo_source_collection_real_editable_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->baseline_reimported = library_photo_source_collection_real_baseline_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->source_reimported = library_photo_source_collection_real_source_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("master_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("editable_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("baseline_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("source_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 38383 "Photo.c"
+#line 38398 "Photo.c"
 }
 
 
@@ -38395,59 +38410,59 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 	GeeHashMap* _tmp3_ = NULL;
 	GeeHashMap* _tmp4_ = NULL;
 	GeeTreeMultiMap* _tmp5_ = NULL;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->by_editable_file = _tmp0_;
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->by_editable_file = _tmp0_;
+#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#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"
+	self->priv->by_raw_development_file = _tmp1_;
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
+#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->photo_to_master_filesize = _tmp3_;
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->photo_to_master_filesize = _tmp3_;
+#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
-#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->photo_to_editable_filesize = _tmp4_;
 #line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->photo_to_editable_filesize = _tmp4_;
+#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 38422 "Photo.c"
+#line 38437 "Photo.c"
 }
 
 
 static void library_photo_source_collection_finalize (DataCollection* obj) {
 	LibraryPhotoSourceCollection * self;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->by_editable_file);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->by_raw_development_file);
+	_g_object_unref0 (self->priv->by_editable_file);
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->filesize_to_photo);
+	_g_object_unref0 (self->priv->by_raw_development_file);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->photo_to_master_filesize);
+	_g_object_unref0 (self->priv->filesize_to_photo);
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->photo_to_editable_filesize);
+	_g_object_unref0 (self->priv->photo_to_master_filesize);
 #line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_object_unref0 (self->priv->photo_to_editable_filesize);
+#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38446 "Photo.c"
+#line 38461 "Photo.c"
 }
 
 
@@ -38464,9 +38479,9 @@ GType library_photo_source_collection_get_type (void) {
 
 
 static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) {
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38465 "Photo.c"
+#line 38480 "Photo.c"
 }
 
 
@@ -38478,69 +38493,69 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	guint64 _tmp3_ = 0ULL;
 	PhotoRow* _tmp7_ = NULL;
 	guint64 _tmp8_ = 0ULL;
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 4960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 4960 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = (LibraryPhoto*) photo_construct (object_type, _tmp0_);
 #line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = (LibraryPhoto*) photo_construct (object_type, _tmp0_);
+#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->import_keywords = NULL;
 #line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->import_keywords = NULL;
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp1_;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = row;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->flags;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38499 "Photo.c"
+#line 38514 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp4_ = NULL;
 		PhotoRow* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = library_photo_global;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = row;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_->backlinks;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38511 "Photo.c"
+#line 38526 "Photo.c"
 	}
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38519 "Photo.c"
+#line 38534 "Photo.c"
 		PhotoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = row;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38528 "Photo.c"
+#line 38543 "Photo.c"
 	}
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38532 "Photo.c"
+#line 38547 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new (PhotoRow* row) {
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38539 "Photo.c"
+#line 38554 "Photo.c"
 }
 
 
@@ -38558,87 +38573,87 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	PhotoImportParams* _tmp13_ = NULL;
 	PhotoRow* _tmp14_ = NULL;
 	guint64 _tmp15_ = 0ULL;
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL);
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = import_params;
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->row;
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = (LibraryPhoto*) photo_construct (object_type, _tmp1_);
 #line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = (LibraryPhoto*) photo_construct (object_type, _tmp1_);
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = import_params;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->keywords;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = _tmp4_;
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp5_;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = import_params;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->row;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38589 "Photo.c"
+#line 38604 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp9_ = NULL;
 		PhotoImportParams* _tmp10_ = NULL;
 		PhotoRow* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_global;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = import_params;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_->row;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->backlinks;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_);
-#line 38604 "Photo.c"
+#line 38619 "Photo.c"
 	}
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->row;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_->flags;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38614 "Photo.c"
+#line 38629 "Photo.c"
 		PhotoImportParams* _tmp16_ = NULL;
 		PhotoRow* _tmp17_ = NULL;
 		guint64 _tmp18_ = 0ULL;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = import_params;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_->row;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_->flags;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38626 "Photo.c"
+#line 38641 "Photo.c"
 	}
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38630 "Photo.c"
+#line 38645 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38637 "Photo.c"
+#line 38652 "Photo.c"
 }
 
 
@@ -38667,59 +38682,59 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp39_ = NULL;
 	LibraryPhotoSourceCollection* _tmp40_ = NULL;
 	GeeArrayList* _tmp41_ = NULL;
-#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_init_photo ();
 #line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_init_photo ();
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_collection_new ();
-#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_data_collection_unref0 (library_photo_global);
-#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_global = _tmp0_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_table_get_instance ();
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_all (_tmp2_);
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp2_);
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	all = _tmp4_;
-#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	all_photos = _tmp5_;
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	trashed_photos = _tmp6_;
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 	offline_photos = _tmp7_;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = all;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38706 "Photo.c"
+#line 38721 "Photo.c"
 	{
 		gint ctr = 0;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38711 "Photo.c"
+#line 38726 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = TRUE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 38718 "Photo.c"
+#line 38733 "Photo.c"
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				PhotoRow* row = NULL;
@@ -38735,159 +38750,159 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				guint64 _tmp22_ = 0ULL;
 				ProgressMonitor _tmp30_ = NULL;
 				void* _tmp30__target = NULL;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38736 "Photo.c"
+#line 38751 "Photo.c"
 					gint _tmp12_ = 0;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38742 "Photo.c"
+#line 38757 "Photo.c"
 				}
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = ctr;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = count;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp13_ < _tmp14_)) {
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38754 "Photo.c"
+#line 38769 "Photo.c"
 				}
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = ctr;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_);
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (PhotoRow*) _tmp17_;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = row;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = library_photo_new (_tmp18_);
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp19_;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = row;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = _tmp20_->flags;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
-				flags = _tmp21_;
 #line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+				flags = _tmp21_;
+#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = flags;
-#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 				if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38780 "Photo.c"
+#line 38795 "Photo.c"
 					GeeArrayList* _tmp23_ = NULL;
 					LibraryPhoto* _tmp24_ = NULL;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = trashed_photos;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38789 "Photo.c"
+#line 38804 "Photo.c"
 				} else {
 					guint64 _tmp25_ = 0ULL;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = flags;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38796 "Photo.c"
+#line 38811 "Photo.c"
 						GeeArrayList* _tmp26_ = NULL;
 						LibraryPhoto* _tmp27_ = NULL;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = offline_photos;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = photo;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38805 "Photo.c"
+#line 38820 "Photo.c"
 					} else {
 						GeeArrayList* _tmp28_ = NULL;
 						LibraryPhoto* _tmp29_ = NULL;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = all_photos;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = photo;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38815 "Photo.c"
+#line 38830 "Photo.c"
 					}
 				}
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = monitor;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30__target = monitor_target;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp30_ != NULL) {
-#line 38824 "Photo.c"
+#line 38839 "Photo.c"
 					ProgressMonitor _tmp31_ = NULL;
 					void* _tmp31__target = NULL;
 					gint _tmp32_ = 0;
 					gint _tmp33_ = 0;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = monitor;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31__target = monitor_target;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = ctr;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = count;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38839 "Photo.c"
+#line 38854 "Photo.c"
 				}
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_row_unref0 (row);
-#line 38845 "Photo.c"
+#line 38860 "Photo.c"
 			}
 		}
 	}
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = library_photo_global;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = all_photos;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp37_);
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_global;
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = trashed_photos;
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = offline_photos;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (offline_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (trashed_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all);
-#line 38879 "Photo.c"
+#line 38894 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
-#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 38886 "Photo.c"
+#line 38901 "Photo.c"
 }
 
 
@@ -38904,139 +38919,139 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	gboolean _tmp6_ = FALSE;
 	PhotoImportParams* _tmp7_ = NULL;
 	LibraryPhoto* _tmp8_ = NULL;
-#line 5029 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
 #line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = params;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->row;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_add (_tmp1_, _tmp3_, &_tmp4_);
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp5_;
-#line 5032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_id_is_invalid (&photo_id);
-#line 5032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_photo = NULL;
 #line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_photo = NULL;
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo) {
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 38935 "Photo.c"
+#line 38950 "Photo.c"
 		} else {
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 38939 "Photo.c"
+#line 38954 "Photo.c"
 		}
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38943 "Photo.c"
+#line 38958 "Photo.c"
 	}
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = library_photo_new_from_import_params (_tmp7_);
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_vala_photo);
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_photo = _tmp8_;
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_photo = _tmp8_;
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (photo) {
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 38959 "Photo.c"
+#line 38974 "Photo.c"
 	} else {
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 38963 "Photo.c"
+#line 38978 "Photo.c"
 	}
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38967 "Photo.c"
+#line 38982 "Photo.c"
 }
 
 
 void library_photo_import_failed (LibraryPhoto* photo) {
 	GError * _inner_error_ = NULL;
-#line 5044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 38975 "Photo.c"
+#line 38990 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
 		LibraryPhoto* _tmp2_ = NULL;
 		PhotoID _tmp3_ = {0};
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo;
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 38997 "Photo.c"
-				goto __catch405_database_error;
+#line 39012 "Photo.c"
+				goto __catch406_database_error;
 			}
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39006 "Photo.c"
+#line 39021 "Photo.c"
 		}
 	}
-	goto __finally405;
-	__catch405_database_error:
+	goto __finally406;
+	__catch406_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39024 "Photo.c"
+#line 39039 "Photo.c"
 	}
-	__finally405:
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally406:
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39035 "Photo.c"
+#line 39050 "Photo.c"
 	}
 }
 
@@ -39046,21 +39061,21 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5053 "/home/jens/Source/shotwell/src/Photo.vala"
-	PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+	PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
+#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39059 "Photo.c"
+#line 39074 "Photo.c"
 }
 
 
@@ -39069,21 +39084,21 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5059 "/home/jens/Source/shotwell/src/Photo.vala"
-	PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+	PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
+#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39082 "Photo.c"
+#line 39097 "Photo.c"
 }
 
 
@@ -39092,21 +39107,21 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5065 "/home/jens/Source/shotwell/src/Photo.vala"
-	PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+	PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39105 "Photo.c"
+#line 39120 "Photo.c"
 }
 
 
@@ -39115,80 +39130,80 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5071 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5071 "/home/jens/Source/shotwell/src/Photo.vala"
-	PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+	PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
+#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39128 "Photo.c"
+#line 39143 "Photo.c"
 }
 
 
 static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 	GError * _inner_error_ = NULL;
-#line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39136 "Photo.c"
+#line 39151 "Photo.c"
 	{
-#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_);
-#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39142 "Photo.c"
-			goto __catch406_g_error;
+#line 39157 "Photo.c"
+			goto __catch407_g_error;
 		}
 	}
-	goto __finally406;
-	__catch406_g_error:
+	goto __finally407;
+	__catch407_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5080: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_);
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:5082: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_);
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp1_);
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39172 "Photo.c"
+#line 39187 "Photo.c"
 	}
-	__finally406:
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally407:
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39183 "Photo.c"
+#line 39198 "Photo.c"
 	}
-#line 5084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39187 "Photo.c"
+#line 39202 "Photo.c"
 }
 
 
@@ -39196,28 +39211,28 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 5088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5090 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->import_keywords;
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39205 "Photo.c"
+#line 39220 "Photo.c"
 }
 
 
 void library_photo_clear_import_keywords (LibraryPhoto* self) {
-#line 5092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 5093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 39216 "Photo.c"
+#line 39231 "Photo.c"
 }
 
 
@@ -39226,44 +39241,44 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	Alteration* _tmp5_ = NULL;
-#line 5096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5096 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (IS_ALTERATION (alteration));
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (IS_ALTERATION (alteration));
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = self->priv->block_thumbnail_generation;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 39233 "Photo.c"
+#line 39248 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39242 "Photo.c"
+#line 39257 "Photo.c"
 	} else {
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39246 "Photo.c"
+#line 39261 "Photo.c"
 	}
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39250 "Photo.c"
+#line 39265 "Photo.c"
 		OneShotScheduler* _tmp4_ = NULL;
-#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->thumbnail_scheduler;
-#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39256 "Photo.c"
+#line 39271 "Photo.c"
 	}
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 39262 "Photo.c"
+#line 39277 "Photo.c"
 }
 
 
@@ -39274,31 +39289,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp0_;
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39287 "Photo.c"
+#line 39302 "Photo.c"
 	}
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39297 "Photo.c"
+#line 39312 "Photo.c"
 }
 
 
@@ -39306,71 +39321,71 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	LibraryPhoto * self;
 	Rotation _tmp0_ = 0;
 	GError * _inner_error_ = NULL;
-#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5112 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
+#line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = TRUE;
-#line 5113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5115 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = rotation;
-#line 5113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5115 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5116 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 39315 "Photo.c"
+#line 39330 "Photo.c"
 	{
 		Rotation _tmp1_ = 0;
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = rotation;
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39324 "Photo.c"
-			goto __catch407_g_error;
+#line 39339 "Photo.c"
+			goto __catch408_g_error;
 		}
 	}
-	goto __finally407;
-	__catch407_g_error:
+	goto __finally408;
+	__catch408_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5125: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_);
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:5127: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_);
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp3_);
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39354 "Photo.c"
+#line 39369 "Photo.c"
 	}
-	__finally407:
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally408:
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39365 "Photo.c"
+#line 39380 "Photo.c"
 	}
-#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5130 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39369 "Photo.c"
+#line 39384 "Photo.c"
 }
 
 
@@ -39382,40 +39397,40 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39395 "Photo.c"
+#line 39410 "Photo.c"
 	}
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39407 "Photo.c"
+#line 39422 "Photo.c"
 }
 
 
 static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) {
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39414 "Photo.c"
+#line 39429 "Photo.c"
 }
 
 
@@ -39430,53 +39445,53 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	GFile* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 5138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((backing == NULL) || IS_BACKING_PHOTO_ROW (backing));
-#line 5139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID);
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 39441 "Photo.c"
+#line 39456 "Photo.c"
 	} else {
 		BackingPhotoRow* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = backing;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->filepath;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39451 "Photo.c"
+#line 39466 "Photo.c"
 	}
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = backing_id;
-#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39459 "Photo.c"
+#line 39474 "Photo.c"
 	}
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->filepath;
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = g_file_new_for_path (_tmp5_);
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp6_;
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = file;
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_query_exists (_tmp7_, NULL);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 39475 "Photo.c"
+#line 39490 "Photo.c"
 		GFile* dupe_file = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
@@ -39486,105 +39501,105 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		BackingPhotoRow* _tmp13_ = NULL;
 		BackingPhotoRow* _tmp14_ = NULL;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = library_files_duplicate (_tmp9_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		dupe_file = _tmp10_;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39499 "Photo.c"
+#line 39514 "Photo.c"
 		}
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp11_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp12_, &_inner_error_);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp12_;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		state = _tmp13_;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (dupe_file);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39523 "Photo.c"
+#line 39538 "Photo.c"
 		}
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = state;
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_ != NULL) {
-#line 39529 "Photo.c"
+#line 39544 "Photo.c"
 			BackingPhotoTable* _tmp15_ = NULL;
 			BackingPhotoTable* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
 			BackingPhotoRow* _tmp18_ = NULL;
 			BackingPhotoID _tmp19_ = {0};
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing_photo_table_get_instance ();
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = state;
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp16_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (state);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dupe_file);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 39559 "Photo.c"
+#line 39574 "Photo.c"
 			}
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp18_->id;
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_id = _tmp19_;
-#line 39567 "Photo.c"
+#line 39582 "Photo.c"
 		}
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 39575 "Photo.c"
+#line 39590 "Photo.c"
 	}
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 39583 "Photo.c"
+#line 39598 "Photo.c"
 }
 
 
@@ -39649,231 +39664,231 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	GeeList* _tmp51_ = NULL;
 	GeeCollection* _tmp52_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5159 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
 #line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = library_files_duplicate (_tmp1_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_);
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_file = _tmp3_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39668 "Photo.c"
+#line 39683 "Photo.c"
 	}
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp5_, &_tmp6_, &_inner_error_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp5_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_editable_id = _tmp7_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39690 "Photo.c"
+#line 39705 "Photo.c"
 	}
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp9_, &_tmp10_, &_inner_error_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp9_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_shotwell_id = _tmp11_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39712 "Photo.c"
+#line 39727 "Photo.c"
 	}
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp13_, &_tmp14_, &_inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp13_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_camera_id = _tmp15_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39734 "Photo.c"
+#line 39749 "Photo.c"
 	}
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp17_, &_tmp18_, &_inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp17_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_embedded_id = _tmp19_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39756 "Photo.c"
+#line 39771 "Photo.c"
 	}
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp22_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dupe_file;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_file_get_path (_tmp23_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dupe_editable_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = dupe_raw_shotwell_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = dupe_raw_camera_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = dupe_raw_embedded_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_duplicate (_tmp21_, &_tmp22_, _tmp25_, &_tmp26_, &_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp25_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp21_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
-	dupe_id = _tmp31_;
 #line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+	dupe_id = _tmp31_;
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_table_get_instance ();
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = dupe_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_row (_tmp33_, &_tmp34_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp33_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_row = _tmp36_;
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = dupe_row;
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_new (_tmp37_);
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe = _tmp38_;
-#line 5181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = dupe;
-#line 5181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5183 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_duplicate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = dupe;
-#line 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_OBJECT, DataObject));
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = dupe;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_ != NULL;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp44_);
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39830 "Photo.c"
+#line 39845 "Photo.c"
 		LibraryPhoto* _tmp46_ = NULL;
 		Event* _tmp47_ = NULL;
 		Event* _tmp48_ = NULL;
 		LibraryPhoto* _tmp49_ = NULL;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = dupe;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = dupe;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp48_);
-#line 39847 "Photo.c"
+#line 39862 "Photo.c"
 	}
-#line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
-#line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = tag_source_collection_fetch_for_source (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = tags;
-#line 5192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39859 "Photo.c"
+#line 39874 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeCollection* _tmp53_ = NULL;
 			GeeIterator* _tmp54_ = NULL;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = tags;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_it = _tmp54_;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39872 "Photo.c"
+#line 39887 "Photo.c"
 				GeeIterator* _tmp55_ = NULL;
 				gboolean _tmp56_ = FALSE;
 				Tag* tag = NULL;
@@ -39881,84 +39896,84 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				gpointer _tmp58_ = NULL;
 				Tag* _tmp59_ = NULL;
 				LibraryPhoto* _tmp60_ = NULL;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = _tag_it;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp56_) {
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 39888 "Photo.c"
+#line 39903 "Photo.c"
 				}
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp58_;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = tag;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = dupe;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 39904 "Photo.c"
+#line 39919 "Photo.c"
 			}
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 39908 "Photo.c"
+#line 39923 "Photo.c"
 		}
 	}
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = dupe;
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (dupe_row);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dupe_file);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39921 "Photo.c"
+#line 39936 "Photo.c"
 }
 
 
 static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) {
-#line 5201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5203 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5204 "/home/jens/Source/shotwell/src/Photo.vala"
 	spin_event_loop ();
-#line 39930 "Photo.c"
+#line 39945 "Photo.c"
 }
 
 
 static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) {
 	guint64 _tmp0_ = 0ULL;
 	guint64 _tmp1_ = 0ULL;
-#line 5205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = flags;
-#line 5206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) {
-#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
-#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5210 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL);
-#line 39947 "Photo.c"
+#line 39962 "Photo.c"
 	}
-#line 5211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
-#line 5211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) {
-#line 5212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
-#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL);
-#line 39957 "Photo.c"
+#line 39972 "Photo.c"
 	}
 }
 
@@ -39967,35 +39982,35 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5220 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH);
-#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39974 "Photo.c"
+#line 39989 "Photo.c"
 }
 
 
 static void library_photo_real_trash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5224 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5225 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 39984 "Photo.c"
+#line 39999 "Photo.c"
 }
 
 
 static void library_photo_real_untrash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5228 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5229 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 39994 "Photo.c"
+#line 40009 "Photo.c"
 }
 
 
@@ -40003,35 +40018,35 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE);
-#line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40010 "Photo.c"
+#line 40025 "Photo.c"
 }
 
 
 static void library_photo_real_mark_offline (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5236 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5237 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40020 "Photo.c"
+#line 40035 "Photo.c"
 }
 
 
 static void library_photo_real_mark_online (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5241 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40030 "Photo.c"
+#line 40045 "Photo.c"
 }
 
 
@@ -40039,15 +40054,15 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED);
-#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40046 "Photo.c"
+#line 40061 "Photo.c"
 }
 
 
@@ -40055,17 +40070,17 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 5246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40064 "Photo.c"
+#line 40079 "Photo.c"
 }
 
 
@@ -40073,17 +40088,17 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 5250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40082 "Photo.c"
+#line 40097 "Photo.c"
 }
 
 
@@ -40094,35 +40109,35 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 5254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 40105 "Photo.c"
+#line 40120 "Photo.c"
 	}
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
-#line 5258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 5258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40113 "Photo.c"
+#line 40128 "Photo.c"
 	}
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40121 "Photo.c"
+#line 40136 "Photo.c"
 }
 
 
@@ -40131,76 +40146,76 @@ static void library_photo_real_destroy (DataSource* base) {
 	PhotoID photo_id = {0};
 	PhotoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 5263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5265 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp0_);
-#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp0_;
-#line 5267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5269 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40138 "Photo.c"
+#line 40153 "Photo.c"
 	{
 		PhotoTable* _tmp1_ = NULL;
 		PhotoTable* _tmp2_ = NULL;
 		PhotoID _tmp3_ = {0};
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_table_get_instance ();
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_id;
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp2_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40157 "Photo.c"
-				goto __catch408_database_error;
+#line 40172 "Photo.c"
+				goto __catch409_database_error;
 			}
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40166 "Photo.c"
+#line 40181 "Photo.c"
 		}
 	}
-	goto __finally408;
-	__catch408_database_error:
+	goto __finally409;
+	__catch409_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 40184 "Photo.c"
+#line 40199 "Photo.c"
 	}
-	__finally408:
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally409:
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40195 "Photo.c"
+#line 40210 "Photo.c"
 	}
-#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5280 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource));
-#line 40199 "Photo.c"
+#line 40214 "Photo.c"
 }
 
 
@@ -40212,25 +40227,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoID _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-#line 5281 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_id_is_valid (&_tmp4_);
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40229 "Photo.c"
+#line 40244 "Photo.c"
 }
 
 
@@ -40250,79 +40265,79 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	PhotoID* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
 	PhotoID _tmp18_ = {0};
-#line 5286 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
 #line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = _tmp5_;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids_length1 = _tmp4_;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
-	_ids_size_ = ids_length1;
 #line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+	_ids_size_ = ids_length1;
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = ids;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7__length1 = ids_length1;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 40275 "Photo.c"
+#line 40290 "Photo.c"
 	} else {
 		PhotoID* _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = ids;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8__length1 = ids_length1;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40285 "Photo.c"
+#line 40300 "Photo.c"
 	}
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40289 "Photo.c"
+#line 40304 "Photo.c"
 		PhotoID _tmp9_ = {0};
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = _tmp9_;
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		ids = (g_free (ids), NULL);
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40299 "Photo.c"
+#line 40314 "Photo.c"
 	}
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = ids;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10__length1 = ids_length1;
-#line 40305 "Photo.c"
+#line 40320 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
 		gint _id_collection_size_ = 0;
 		gint id_it = 0;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection = _tmp10_;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection_length1 = _tmp10__length1;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40317 "Photo.c"
+#line 40332 "Photo.c"
 			PhotoID id = {0};
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40321 "Photo.c"
+#line 40336 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
 				LibraryPhotoSourceCollection* _tmp11_ = NULL;
@@ -40330,60 +40345,60 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 				LibraryPhoto* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				LibraryPhoto* _tmp15_ = NULL;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = library_photo_global;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = id;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_);
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp13_;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_ != NULL) {
-#line 40341 "Photo.c"
+#line 40356 "Photo.c"
 					LibraryPhoto* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = !_tmp17_;
-#line 40350 "Photo.c"
+#line 40365 "Photo.c"
 				} else {
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40354 "Photo.c"
+#line 40369 "Photo.c"
 				}
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					*result = id;
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					ids = (g_free (ids), NULL);
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 40366 "Photo.c"
+#line 40381 "Photo.c"
 				}
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40370 "Photo.c"
+#line 40385 "Photo.c"
 			}
 		}
 	}
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp18_, PHOTO_ID_INVALID);
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp18_;
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = (g_free (ids), NULL);
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 40382 "Photo.c"
+#line 40397 "Photo.c"
 }
 
 
@@ -40412,179 +40427,179 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	gint _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
 	GeeList* _tmp29_ = NULL;
-#line 5302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5303 "/home/jens/Source/shotwell/src/Photo.vala"
-	tags = _tmp1_;
 #line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+	tags = _tmp1_;
+#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp2_;
-#line 5306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = metadata;
-#line 5306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 40427 "Photo.c"
+#line 40442 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		GeeList* _tmp6_ = NULL;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = tags;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_ != NULL) {
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40437 "Photo.c"
+#line 40452 "Photo.c"
 		} else {
 			GeeList* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = tags;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp9_ > 0;
-#line 40450 "Photo.c"
+#line 40465 "Photo.c"
 		}
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = TRUE;
-#line 40456 "Photo.c"
+#line 40471 "Photo.c"
 		} else {
 			Rating _tmp10_ = 0;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40463 "Photo.c"
+#line 40478 "Photo.c"
 		}
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40473 "Photo.c"
+#line 40488 "Photo.c"
 	}
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_metadata_get_rating (_tmp12_);
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != _tmp13_) {
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40491 "Photo.c"
+#line 40506 "Photo.c"
 	}
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL);
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = _tmp15_;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = tags;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 40503 "Photo.c"
+#line 40518 "Photo.c"
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = tags;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp20_;
-#line 40515 "Photo.c"
+#line 40530 "Photo.c"
 	} else {
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40519 "Photo.c"
+#line 40534 "Photo.c"
 	}
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = keywords;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 40527 "Photo.c"
+#line 40542 "Photo.c"
 		GeeSet* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = keywords;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp25_;
-#line 40539 "Photo.c"
+#line 40554 "Photo.c"
 	} else {
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40543 "Photo.c"
+#line 40558 "Photo.c"
 	}
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
-	keywords_count = _tmp21_;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+	keywords_count = _tmp21_;
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = tags_count;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = keywords_count;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != _tmp27_) {
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (keywords);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40563 "Photo.c"
+#line 40578 "Photo.c"
 	}
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = tags;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ != NULL) {
-#line 40569 "Photo.c"
+#line 40584 "Photo.c"
 		GeeSet* _tmp30_ = NULL;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40575 "Photo.c"
+#line 40590 "Photo.c"
 	} else {
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40579 "Photo.c"
+#line 40594 "Photo.c"
 	}
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40583 "Photo.c"
+#line 40598 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp31_ = NULL;
@@ -40594,25 +40609,25 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
 			gint _tag_index = 0;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = tags;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = _g_object_ref0 (_tmp31_);
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp32_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tag_list;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = _tmp34_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp35_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40611 "Photo.c"
+#line 40626 "Photo.c"
 				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
 				gint _tmp38_ = 0;
@@ -40628,86 +40643,86 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 				gchar* _tmp47_ = NULL;
 				gboolean _tmp48_ = FALSE;
 				gboolean _tmp49_ = FALSE;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp36_ + 1;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tag_size;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp37_ < _tmp38_)) {
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40639 "Photo.c"
+#line 40654 "Photo.c"
 				}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_list_get (_tmp39_, _tmp40_);
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp41_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = keywords;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = tag;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject));
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = !_tmp48_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp47_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp45_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_) {
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tag);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tag_list);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (keywords);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tags);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 40685 "Photo.c"
+#line 40700 "Photo.c"
 				}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40689 "Photo.c"
+#line 40704 "Photo.c"
 			}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40693 "Photo.c"
+#line 40708 "Photo.c"
 		}
 	}
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40706 "Photo.c"
+#line 40721 "Photo.c"
 }
 
 
@@ -40719,30 +40734,30 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	GeeList* _tmp2_ = NULL;
 	PhotoMetadata* _tmp22_ = NULL;
 	Rating _tmp23_ = 0;
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_tags = _tmp1_;
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_tags;
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 40732 "Photo.c"
+#line 40747 "Photo.c"
 		GeeCollection* string_tags = NULL;
 		GeeArrayList* _tmp3_ = NULL;
 		PhotoMetadata* _tmp19_ = NULL;
 		GeeCollection* _tmp20_ = NULL;
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40741 "Photo.c"
+#line 40756 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp4_ = NULL;
@@ -40752,25 +40767,25 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tag_index = 0;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_tags;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp5_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tag_list;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp8_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40769 "Photo.c"
+#line 40784 "Photo.c"
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
@@ -40782,74 +40797,74 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				Tag* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp9_ + 1;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tag_size;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40793 "Photo.c"
+#line 40808 "Photo.c"
 				}
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp14_;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = string_tags;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = tag;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_collection_add (_tmp15_, _tmp18_);
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp18_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40817 "Photo.c"
+#line 40832 "Photo.c"
 			}
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40821 "Photo.c"
+#line 40836 "Photo.c"
 		}
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = string_tags;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (string_tags);
-#line 40831 "Photo.c"
+#line 40846 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp21_ = NULL;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = metadata;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40838 "Photo.c"
+#line 40853 "Photo.c"
 	}
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_rating (_tmp22_, _tmp23_);
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_tags);
-#line 40848 "Photo.c"
+#line 40863 "Photo.c"
 }
 
 
@@ -40863,63 +40878,63 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	GeeSet* _tmp7_ = NULL;
 	GeeCollection* _tmp8_ = NULL;
 	HierarchicalTagIndex* _tmp39_ = NULL;
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5344 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_htag_index = NULL;
 #line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_htag_index = NULL;
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
-#line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 40874 "Photo.c"
+#line 40889 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		GeeSet* _tmp3_ = NULL;
 		GeeSet* _tmp4_ = NULL;
 		HierarchicalTagIndex* _tmp5_ = NULL;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_);
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_hierarchical_tag_index_unref0 (new_htag_index);
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		new_htag_index = _tmp5_;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 40893 "Photo.c"
+#line 40908 "Photo.c"
 	}
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL);
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = keywords;
-#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 40905 "Photo.c"
+#line 40920 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = keywords;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_keyword_it = _tmp10_;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40918 "Photo.c"
+#line 40933 "Photo.c"
 				GeeIterator* _tmp11_ = NULL;
 				gboolean _tmp12_ = FALSE;
 				gchar* keyword = NULL;
@@ -40942,156 +40957,156 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp36_ = NULL;
 				Tag* _tmp37_ = NULL;
 				Tag* _tmp38_ = NULL;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _keyword_it;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = gee_iterator_next (_tmp11_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp12_) {
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40949 "Photo.c"
+#line 40964 "Photo.c"
 				}
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_get (_tmp13_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				keyword = (gchar*) _tmp14_;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_htag_index;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp16_ != NULL) {
-#line 40961 "Photo.c"
+#line 40976 "Photo.c"
 					HierarchicalTagIndex* _tmp17_ = NULL;
 					const gchar* _tmp18_ = NULL;
 					gboolean _tmp19_ = FALSE;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = new_htag_index;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = keyword;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp19_;
-#line 40973 "Photo.c"
+#line 40988 "Photo.c"
 				} else {
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 40977 "Photo.c"
+#line 40992 "Photo.c"
 				}
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 40985 "Photo.c"
+#line 41000 "Photo.c"
 				}
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_);
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				safe_keyword = _tmp21_;
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = safe_keyword;
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_);
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				promoted_keyword = _tmp23_;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = tag_global;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = safe_keyword;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp26_) {
-#line 41007 "Photo.c"
+#line 41022 "Photo.c"
 					const gchar* _tmp27_ = NULL;
 					Tag* _tmp28_ = NULL;
 					Tag* _tmp29_ = NULL;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = safe_keyword;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = tag_for_path (_tmp27_);
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _tmp28_;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp29_);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41029 "Photo.c"
+#line 41044 "Photo.c"
 				}
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = promoted_keyword;
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp32_) {
-#line 41039 "Photo.c"
+#line 41054 "Photo.c"
 					const gchar* _tmp33_ = NULL;
 					Tag* _tmp34_ = NULL;
 					Tag* _tmp35_ = NULL;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = promoted_keyword;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = tag_for_path (_tmp33_);
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp35_ = _tmp34_;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp35_);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41061 "Photo.c"
+#line 41076 "Photo.c"
 				}
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = tag_for_path (_tmp36_);
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_;
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp38_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (promoted_keyword);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (safe_keyword);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (keyword);
-#line 41079 "Photo.c"
+#line 41094 "Photo.c"
 			}
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41083 "Photo.c"
+#line 41098 "Photo.c"
 		}
 	}
-#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = new_htag_index;
-#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ != NULL) {
-#line 41090 "Photo.c"
+#line 41105 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
 			HierarchicalTagIndex* _tmp40_ = NULL;
@@ -41099,23 +41114,23 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			GeeCollection* _tmp42_ = NULL;
 			GeeIterator* _tmp43_ = NULL;
 			GeeIterator* _tmp44_ = NULL;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = new_htag_index;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp42_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_path_it = _tmp44_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41114 "Photo.c"
+#line 41129 "Photo.c"
 				GeeIterator* _tmp45_ = NULL;
 				gboolean _tmp46_ = FALSE;
 				gchar* path = NULL;
@@ -41124,150 +41139,150 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp49_ = NULL;
 				Tag* _tmp50_ = NULL;
 				Tag* _tmp51_ = NULL;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _path_it;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_next (_tmp45_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp46_) {
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41131 "Photo.c"
+#line 41146 "Photo.c"
 				}
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_iterator_get (_tmp47_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				path = (gchar*) _tmp48_;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = path;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = tag_for_path (_tmp49_);
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = _tmp50_;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp51_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (path);
-#line 41151 "Photo.c"
+#line 41166 "Photo.c"
 			}
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41155 "Photo.c"
+#line 41170 "Photo.c"
 		}
 	}
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41162 "Photo.c"
+#line 41177 "Photo.c"
 }
 
 
 static void library_photo_class_init (LibraryPhotoClass * klass) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_parent_class = g_type_class_peek_parent (klass);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate));
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_master_reimported = library_photo_real_notify_master_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_editable_reimported = library_photo_real_notify_editable_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_source_reimported = library_photo_real_notify_source_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_baseline_reimported = library_photo_real_notify_baseline_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataObjectClass *) klass)->notify_altered = library_photo_real_notify_altered;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = library_photo_real_get_preview_pixbuf;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->rotate = library_photo_real_rotate;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = library_photo_real_get_thumbnail;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_trashed = library_photo_real_is_trashed;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->trash = library_photo_real_trash;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->untrash = library_photo_real_untrash;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_offline = library_photo_real_is_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_offline = library_photo_real_mark_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_online = library_photo_real_mark_online;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = library_photo_real_internal_delete_backing;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->destroy = library_photo_real_destroy;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->has_user_generated_metadata = library_photo_real_has_user_generated_metadata;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->set_user_metadata_for_export = library_photo_real_set_user_metadata_for_export;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->apply_user_metadata_for_reimport = library_photo_real_apply_user_metadata_for_reimport;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41211 "Photo.c"
+#line 41226 "Photo.c"
 }
 
 
 static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_flagged = (gboolean (*)(Flaggable*)) library_photo_real_is_flagged;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged;
-#line 41224 "Photo.c"
+#line 41239 "Photo.c"
 }
 
 
 static void library_photo_monitorable_interface_init (MonitorableIface * iface) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_offline = (gboolean (*)(Monitorable*)) library_photo_real_is_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_offline = (void (*)(Monitorable*)) library_photo_real_mark_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_online = (void (*)(Monitorable*)) library_photo_real_mark_online;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp;
-#line 41241 "Photo.c"
+#line 41256 "Photo.c"
 }
 
 
 static void library_photo_instance_init (LibraryPhoto * self) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_GET_PRIVATE (self);
-#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 4956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = NULL;
-#line 41252 "Photo.c"
+#line 41267 "Photo.c"
 }
 
 
 static void library_photo_finalize (GObject* obj) {
 	LibraryPhoto * self;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41266 "Photo.c"
+#line 41281 "Photo.c"
 }
 
 
@@ -41294,30 +41309,30 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
 	void* _tmp1__target = NULL;
 	GetSourceDatabaseKey _tmp2_ = NULL;
 	void* _tmp2__target = NULL;
-#line 5393 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
 #line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = sources;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = check_to_keep;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1__target = check_to_keep_target;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = get_key;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2__target = get_key_target;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
-#line 5393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 41309 "Photo.c"
+#line 41324 "Photo.c"
 }
 
 
 LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
-#line 5393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 41316 "Photo.c"
+#line 41331 "Photo.c"
 }
 
 
@@ -41331,59 +41346,59 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 	GeeHashMap* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL);
-#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 5399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = NULL;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_file_map;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = (LibraryPhoto*) _tmp2_;
-#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ret;
-#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = ret;
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 41354 "Photo.c"
+#line 41369 "Photo.c"
 	}
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp6_;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 41368 "Photo.c"
+#line 41383 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41375 "Photo.c"
+#line 41390 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41382 "Photo.c"
+#line 41397 "Photo.c"
 }
 
 
@@ -41393,30 +41408,30 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	GeeCollection* _tmp40_ = NULL;
 	GeeCollection* _tmp81_ = NULL;
 	GeeCollection* _tmp82_ = NULL;
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
+#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 41402 "Photo.c"
+#line 41417 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp2_;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41415 "Photo.c"
+#line 41430 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataSource* source = NULL;
@@ -41435,41 +41450,41 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				GeeCollection* _tmp25_ = NULL;
 				LibraryPhoto* _tmp38_ = NULL;
 				LibraryPhoto* _tmp39_ = NULL;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _source_it;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41442 "Photo.c"
+#line 41457 "Photo.c"
 				}
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp6_;
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = source;
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp8_;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_ != NULL;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp11_);
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 41468 "Photo.c"
+#line 41483 "Photo.c"
 					GeeHashMap* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
 					GFile* _tmp15_ = NULL;
@@ -41480,60 +41495,60 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					LibraryPhoto* _tmp20_ = NULL;
 					GFile* _tmp21_ = NULL;
 					GFile* _tmp22_ = NULL;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->priv->editable_file_map;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo));
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = _tmp15_;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_);
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp16_);
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->reverse_editable_file_map;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = photo;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = photo;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp22_);
-#line 41507 "Photo.c"
+#line 41522 "Photo.c"
 				}
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_files = _tmp24_;
-#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = raw_files;
-#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp25_ != NULL) {
-#line 41519 "Photo.c"
+#line 41534 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp26_ = NULL;
 						GeeIterator* _tmp27_ = NULL;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = raw_files;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp27_;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 41532 "Photo.c"
+#line 41547 "Photo.c"
 							GeeIterator* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							GFile* f = NULL;
@@ -41545,86 +41560,86 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							GeeMultiMap* _tmp35_ = NULL;
 							LibraryPhoto* _tmp36_ = NULL;
 							GFile* _tmp37_ = NULL;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = _f_it;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = gee_iterator_next (_tmp28_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp29_) {
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 41552 "Photo.c"
+#line 41567 "Photo.c"
 							}
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = gee_iterator_get (_tmp30_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp31_;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp32_ = self->priv->development_file_map;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = f;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = photo;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = self->priv->reverse_development_file_map;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp36_ = photo;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp37_ = f;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 41578 "Photo.c"
+#line 41593 "Photo.c"
 						}
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41582 "Photo.c"
+#line 41597 "Photo.c"
 					}
 				}
-#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self);
-#line 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo;
-#line 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_files);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41599 "Photo.c"
+#line 41614 "Photo.c"
 			}
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41603 "Photo.c"
+#line 41618 "Photo.c"
 		}
 	}
-#line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = removed;
-#line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp40_ != NULL) {
-#line 41610 "Photo.c"
+#line 41625 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp41_ = NULL;
 			GeeIterator* _tmp42_ = NULL;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = removed;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp42_;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41623 "Photo.c"
+#line 41638 "Photo.c"
 				GeeIterator* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
 				DataSource* source = NULL;
@@ -41641,29 +41656,29 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				guint _tmp78_ = 0U;
 				LibraryPhoto* _tmp79_ = NULL;
 				guint _tmp80_ = 0U;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _source_it;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = gee_iterator_next (_tmp43_);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp44_) {
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41648 "Photo.c"
+#line 41663 "Photo.c"
 				}
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_get (_tmp45_);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp46_;
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = source;
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp48_;
-#line 41662 "Photo.c"
+#line 41677 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
 					GeeMultiMap* _tmp49_ = NULL;
@@ -41672,25 +41687,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp52_ = NULL;
 					GeeIterator* _tmp53_ = NULL;
 					GeeIterator* _tmp54_ = NULL;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = self->priv->reverse_editable_file_map;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = photo;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = _tmp51_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = _tmp53_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp52_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp54_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41689 "Photo.c"
+#line 41704 "Photo.c"
 						GeeIterator* _tmp55_ = NULL;
 						gboolean _tmp56_ = FALSE;
 						GFile* f = NULL;
@@ -41698,35 +41713,35 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp58_ = NULL;
 						GeeHashMap* _tmp59_ = NULL;
 						GFile* _tmp60_ = NULL;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp55_ = _f_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp56_) {
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41705 "Photo.c"
+#line 41720 "Photo.c"
 						}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp58_;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = self->priv->editable_file_map;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = f;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41721 "Photo.c"
+#line 41736 "Photo.c"
 					}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41725 "Photo.c"
+#line 41740 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
@@ -41736,25 +41751,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp64_ = NULL;
 					GeeIterator* _tmp65_ = NULL;
 					GeeIterator* _tmp66_ = NULL;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = self->priv->reverse_development_file_map;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp62_ = photo;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp64_ = _tmp63_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = _tmp65_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp64_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp66_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41753 "Photo.c"
+#line 41768 "Photo.c"
 						GeeIterator* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
 						GFile* f = NULL;
@@ -41762,78 +41777,78 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp70_ = NULL;
 						GeeHashMap* _tmp71_ = NULL;
 						GFile* _tmp72_ = NULL;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = _f_it;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = gee_iterator_next (_tmp67_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp68_) {
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41769 "Photo.c"
+#line 41784 "Photo.c"
 						}
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp70_ = gee_iterator_get (_tmp69_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp70_;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp71_ = self->priv->development_file_map;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp72_ = f;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41785 "Photo.c"
+#line 41800 "Photo.c"
 					}
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41789 "Photo.c"
+#line 41804 "Photo.c"
 				}
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove_all (_tmp73_, _tmp74_);
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp75_ = self->priv->reverse_development_file_map;
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp76_ = photo;
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
-				gee_multi_map_remove_all (_tmp75_, _tmp76_);
 #line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+				gee_multi_map_remove_all (_tmp75_, _tmp76_);
+#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp77_ = photo;
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE);
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp78_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self);
-#line 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = photo;
-#line 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE);
-#line 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp80_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41819 "Photo.c"
+#line 41834 "Photo.c"
 			}
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41823 "Photo.c"
+#line 41838 "Photo.c"
 		}
 	}
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp81_ = added;
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp82_ = removed;
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_);
-#line 41832 "Photo.c"
+#line 41847 "Photo.c"
 }
 
 
@@ -41847,79 +41862,79 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	GeeMultiMap* _tmp13_ = NULL;
 	LibraryPhoto* _tmp14_ = NULL;
 	GFile* _tmp15_ = NULL;
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp2_ != NULL, "photo != null");
 #line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp2_ != NULL, "photo != null");
+#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = old_file;
-#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 41868 "Photo.c"
+#line 41883 "Photo.c"
 		GeeHashMap* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		GeeMultiMap* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->editable_file_map;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = old_file;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL);
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->reverse_editable_file_map;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_file;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 41888 "Photo.c"
+#line 41903 "Photo.c"
 	}
-#line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = new_file;
-#line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != NULL) {
-#line 41894 "Photo.c"
+#line 41909 "Photo.c"
 		GeeHashMap* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		LibraryPhoto* _tmp12_ = NULL;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->priv->editable_file_map;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = new_file;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 41906 "Photo.c"
+#line 41921 "Photo.c"
 	}
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = new_file;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 41918 "Photo.c"
+#line 41933 "Photo.c"
 }
 
 
@@ -41935,29 +41950,29 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	LibraryPhoto* _tmp20_ = NULL;
 	GeeCollection* _tmp21_ = NULL;
 	GeeCollection* _tmp22_ = NULL;
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp2_ != NULL, "photo != null");
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->reverse_development_file_map;
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 41956 "Photo.c"
+#line 41971 "Photo.c"
 		GeeMultiMap* _tmp18_ = NULL;
 		LibraryPhoto* _tmp19_ = NULL;
 		{
@@ -41968,25 +41983,25 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->reverse_development_file_map;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp11_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41985 "Photo.c"
+#line 42000 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				GFile* f = NULL;
@@ -41994,68 +42009,68 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gpointer _tmp15_ = NULL;
 				GeeHashMap* _tmp16_ = NULL;
 				GFile* _tmp17_ = NULL;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _f_it;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42001 "Photo.c"
+#line 42016 "Photo.c"
 				}
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp15_;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->development_file_map;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = f;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42017 "Photo.c"
+#line 42032 "Photo.c"
 			}
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42021 "Photo.c"
+#line 42036 "Photo.c"
 		}
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42029 "Photo.c"
+#line 42044 "Photo.c"
 	}
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp21_;
-#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = raw_list;
-#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 42041 "Photo.c"
+#line 42056 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp23_ = NULL;
 			GeeIterator* _tmp24_ = NULL;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = raw_list;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp24_;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42054 "Photo.c"
+#line 42069 "Photo.c"
 				GeeIterator* _tmp25_ = NULL;
 				gboolean _tmp26_ = FALSE;
 				GFile* f = NULL;
@@ -42067,65 +42082,65 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				GeeMultiMap* _tmp32_ = NULL;
 				LibraryPhoto* _tmp33_ = NULL;
 				GFile* _tmp34_ = NULL;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = _f_it;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = gee_iterator_next (_tmp25_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp26_) {
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42074 "Photo.c"
+#line 42089 "Photo.c"
 				}
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = gee_iterator_get (_tmp27_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp28_;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = self->priv->development_file_map;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = f;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = photo;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_);
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->reverse_development_file_map;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = photo;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = f;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42100 "Photo.c"
+#line 42115 "Photo.c"
 			}
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42104 "Photo.c"
+#line 42119 "Photo.c"
 		}
 	}
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42111 "Photo.c"
+#line 42126 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) {
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass);
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->finalize = library_photo_source_holding_tank_finalize;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42124 "Photo.c"
+#line 42139 "Photo.c"
 }
 
 
@@ -42134,43 +42149,43 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 	GeeHashMap* _tmp1_ = NULL;
 	GeeHashMultiMap* _tmp2_ = NULL;
 	GeeHashMultiMap* _tmp3_ = NULL;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/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"
+#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->editable_file_map = _tmp0_;
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->editable_file_map = _tmp0_;
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->development_file_map = _tmp1_;
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->development_file_map = _tmp1_;
+#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
-#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"
+	self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 42151 "Photo.c"
+#line 42166 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) {
 	LibraryPhotoSourceHoldingTank * self;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->editable_file_map);
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->development_file_map);
+	_g_object_unref0 (self->priv->editable_file_map);
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->reverse_editable_file_map);
+	_g_object_unref0 (self->priv->development_file_map);
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_object_unref0 (self->priv->reverse_editable_file_map);
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->reverse_development_file_map);
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42169 "Photo.c"
+#line 42184 "Photo.c"
 }
 
 
diff --git a/src/Photo.vala b/src/Photo.vala
index 222896f..c768017 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -813,12 +813,6 @@ public abstract class Photo : PhotoSource, Dateable {
             // Perform development, bail out if it doesn't work.
             if (!is_raw_developer_complete(d)) {
                 develop_photo(d);
-                try {
-                    get_prefetched_copy();
-                } catch (Error e) {
-                    // couldn't reload the freshly-developed image, nothing to display
-                    return;
-                }
             }
             if (!developments.has_key(d))
                 return; // we tried!
@@ -830,7 +824,14 @@ public abstract class Photo : PhotoSource, Dateable {
             row.developer = d;
             backing_photo_row = developments.get(d);
             readers.developer = backing_photo_row.file_format.create_reader(backing_photo_row.filepath);
-            
+
+            try {
+                get_prefetched_copy();
+            } catch (Error e) {
+                // couldn't reload the freshly-developed image, nothing to display
+                return;
+            }
+
             set_orientation(backing_photo_row.original_orientation);
             
             try {
@@ -1258,6 +1259,7 @@ public abstract class Photo : PhotoSource, Dateable {
         if (params.thumbnails != null) {
             PhotoFileReader reader = params.row.master.file_format.create_reader(
                 params.row.master.filepath);
+            reader.set_role (PhotoFileReader.Role.THUMBNAIL);
             try {
                 ThumbnailCache.generate_for_photo(params.thumbnails, reader, params.row.orientation, 
                     params.row.master.dim);
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index 7d24c99..a1aed95 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -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 __catch584_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 __finally584;
+		__catch584_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:
+		__finally584:
 #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 __catch585_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 __finally585;
+		__catch585_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:
+		__finally585:
 #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 __catch586_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 __finally586;
+	__catch586_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:
+	__finally586:
 #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 __catch587_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 __finally587;
+	__catch587_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:
+	__finally587:
 #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 __catch588_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 __finally588;
+	__catch588_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:
+	__finally588:
 #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 __catch589_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 __finally589;
+	__catch589_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:
+	__finally589:
 #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 __catch590_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally588;
-	__catch588_g_error:
+	goto __finally590;
+	__catch590_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:
+	__finally590:
 #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 __catch591_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally589;
-	__catch589_g_error:
+	goto __finally591;
+	__catch591_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:
+	__finally591:
 #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 5eddab0..579add0 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -3983,7 +3983,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3983 "PhotoPage.c"
-			goto __catch242_g_error;
+			goto __catch243_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -3997,8 +3997,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_object_unref0 (_tmp0_);
 #line 3996 "PhotoPage.c"
 	}
-	goto __finally242;
-	__catch242_g_error:
+	goto __finally243;
+	__catch243_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4012,7 +4012,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (fetch_error);
 #line 4010 "PhotoPage.c"
 	}
-	__finally242:
+	__finally243:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4322,21 +4322,21 @@ 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"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
 #line 4324 "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"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
 #line 4331 "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"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
 #line 4338 "PhotoPage.c"
 }
@@ -4364,35 +4364,35 @@ static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkT
 
 
 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"
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
 #line 4366 "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"
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
 #line 4373 "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"
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
 #line 4380 "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"
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
 #line 4387 "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"
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
 #line 4394 "PhotoPage.c"
 }
@@ -4401,14 +4401,14 @@ static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton
 static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
-#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4403 "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"
+#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
 #line 4410 "PhotoPage.c"
 }
@@ -4417,7 +4417,7 @@ static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_chan
 static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
-#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4419 "PhotoPage.c"
 }
@@ -4426,7 +4426,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_p
 static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
-#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4428 "PhotoPage.c"
 }
@@ -4435,7 +4435,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_rel
 static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
-#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4437 "PhotoPage.c"
 }
@@ -4444,21 +4444,21 @@ static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press
 static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
-#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4446 "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"
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
 #line 4453 "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"
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
 #line 4460 "PhotoPage.c"
 }
@@ -4483,9 +4483,10 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToolButton* _tmp13_ = NULL;
 	GtkToolButton* _tmp14_ = NULL;
 	GtkToolButton* _tmp15_ = NULL;
-	GtkToggleToolButton* _tmp16_ = NULL;
-	GtkToggleToolButton* _tmp17_ = NULL;
-	GtkToggleToolButton* _tmp18_ = NULL;
+	GtkBindingSet* binding_set = NULL;
+	GtkToolButton* _tmp16_ = NULL;
+	GObjectClass* _tmp17_ = NULL;
+	GtkBindingSet* _tmp18_ = NULL;
 	GtkToggleToolButton* _tmp19_ = NULL;
 	GtkToggleToolButton* _tmp20_ = NULL;
 	GtkToggleToolButton* _tmp21_ = NULL;
@@ -4511,52 +4512,55 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToggleToolButton* _tmp41_ = NULL;
 	GtkToggleToolButton* _tmp42_ = NULL;
 	GtkToggleToolButton* _tmp43_ = NULL;
-	GtkToolButton* _tmp44_ = NULL;
-	GtkToolButton* _tmp45_ = NULL;
-	GtkToolButton* _tmp46_ = NULL;
+	GtkToggleToolButton* _tmp44_ = NULL;
+	GtkToggleToolButton* _tmp45_ = NULL;
+	GtkToggleToolButton* _tmp46_ = NULL;
 	GtkToolButton* _tmp47_ = NULL;
 	GtkToolButton* _tmp48_ = NULL;
 	GtkToolButton* _tmp49_ = NULL;
+	GtkToolButton* _tmp50_ = NULL;
+	GtkToolButton* _tmp51_ = NULL;
+	GtkToolButton* _tmp52_ = NULL;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp50_ = NULL;
+	GtkSeparatorToolItem* _tmp53_ = NULL;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp51_ = NULL;
+	GtkBox* _tmp54_ = NULL;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp52_ = NULL;
-	GdkPixbuf* _tmp53_ = NULL;
-	GtkImage* _tmp54_ = NULL;
-	GtkImage* _tmp55_ = NULL;
+	GdkPixbuf* _tmp55_ = NULL;
+	GdkPixbuf* _tmp56_ = NULL;
+	GtkImage* _tmp57_ = NULL;
+	GtkImage* _tmp58_ = NULL;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp56_ = NULL;
-	GtkAdjustment* _tmp57_ = NULL;
-	GtkAdjustment* _tmp58_ = NULL;
-	GtkScale* _tmp59_ = NULL;
-	GtkScale* _tmp60_ = NULL;
-	GtkScale* _tmp61_ = NULL;
+	GtkEventBox* _tmp59_ = NULL;
+	GtkAdjustment* _tmp60_ = NULL;
+	GtkAdjustment* _tmp61_ = NULL;
 	GtkScale* _tmp62_ = NULL;
 	GtkScale* _tmp63_ = NULL;
 	GtkScale* _tmp64_ = NULL;
 	GtkScale* _tmp65_ = NULL;
 	GtkScale* _tmp66_ = NULL;
+	GtkScale* _tmp67_ = NULL;
+	GtkScale* _tmp68_ = NULL;
+	GtkScale* _tmp69_ = NULL;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp67_ = NULL;
-	GdkPixbuf* _tmp68_ = NULL;
-	GtkImage* _tmp69_ = NULL;
-	GtkImage* _tmp70_ = NULL;
+	GdkPixbuf* _tmp70_ = NULL;
+	GdkPixbuf* _tmp71_ = NULL;
+	GtkImage* _tmp72_ = NULL;
+	GtkImage* _tmp73_ = NULL;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp71_ = NULL;
+	GtkEventBox* _tmp74_ = NULL;
 	GtkToolItem* group_wrapper = NULL;
-	GtkToolItem* _tmp72_ = NULL;
-	GtkToolButton* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	GtkToolButton* _tmp75_ = NULL;
+	GtkToolItem* _tmp75_ = NULL;
 	GtkToolButton* _tmp76_ = NULL;
-	GtkToolButton* _tmp77_ = NULL;
+	const gchar* _tmp77_ = NULL;
 	GtkToolButton* _tmp78_ = NULL;
-	const gchar* _tmp79_ = NULL;
+	GtkToolButton* _tmp79_ = NULL;
 	GtkToolButton* _tmp80_ = NULL;
 	GtkToolButton* _tmp81_ = NULL;
-	GtkToolButton* _tmp82_ = NULL;
+	const gchar* _tmp82_ = NULL;
+	GtkToolButton* _tmp83_ = NULL;
+	GtkToolButton* _tmp84_ = NULL;
+	GtkToolButton* _tmp85_ = NULL;
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4629,330 +4633,342 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_tmp15_ = self->priv->rotate_button;
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = self->priv->rotate_button;
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject));
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp18_ = gtk_binding_set_by_class (_tmp17_);
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	binding_set = _tmp18_;
+#line 444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
 #line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp16_);
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->crop_button);
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->crop_button = _tmp16_;
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = self->priv->crop_button;
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop");
-#line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = self->priv->crop_button;
-#line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
+	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp19_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+#line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp19_);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = self->priv->crop_button;
+	_g_object_unref0 (self->priv->crop_button);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
+	self->priv->crop_button = _tmp19_;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = self->priv->crop_button;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp20_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_button_get_type (), GtkToolButton), "crop");
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->crop_button;
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->crop_button;
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp23_ = self->priv->crop_button;
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp23_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp24_ = self->priv->crop_button;
+#line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp23_);
+	_tmp25_ = self->priv->crop_button;
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->straighten_button);
-#line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->straighten_button = _tmp23_;
-#line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = self->priv->straighten_button;
-#line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
-#line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = self->priv->straighten_button;
-#line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp26_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = self->priv->straighten_button;
+	g_object_ref_sink (_tmp26_);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+	_g_object_unref0 (self->priv->straighten_button);
+#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->straighten_button = _tmp26_;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->straighten_button;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->straighten_button;
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = self->priv->straighten_button;
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp30_ = self->priv->straighten_button;
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp30_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp31_ = self->priv->straighten_button;
+#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp30_);
+	_tmp32_ = self->priv->straighten_button;
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->redeye_button);
-#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->redeye_button = _tmp30_;
-#line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = self->priv->redeye_button;
-#line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
-#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = self->priv->redeye_button;
-#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp33_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = self->priv->redeye_button;
+	g_object_ref_sink (_tmp33_);
+#line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->redeye_button);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+	self->priv->redeye_button = _tmp33_;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = self->priv->redeye_button;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp36_ = self->priv->redeye_button;
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp37_ = self->priv->redeye_button;
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp37_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp38_ = self->priv->redeye_button;
+#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp39_ = self->priv->redeye_button;
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp37_);
-#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->adjust_button);
-#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->adjust_button = _tmp37_;
-#line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_ = self->priv->adjust_button;
-#line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
-#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = self->priv->adjust_button;
-#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = self->priv->adjust_button;
+	_tmp40_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+	g_object_ref_sink (_tmp40_);
+#line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->adjust_button);
+#line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->adjust_button = _tmp40_;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->adjust_button;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = self->priv->adjust_button;
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
-#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp44_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp44_ = self->priv->adjust_button;
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp44_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp45_ = self->priv->adjust_button;
+#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->enhance_button);
+	_tmp46_ = self->priv->adjust_button;
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enhance_button = _tmp44_;
-#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = self->priv->enhance_button;
-#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE);
-#line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = self->priv->enhance_button;
-#line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp47_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_ = self->priv->enhance_button;
+	g_object_ref_sink (_tmp47_);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+	_g_object_unref0 (self->priv->enhance_button);
+#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->enhance_button = _tmp47_;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp48_ = self->priv->enhance_button;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_icon_name (_tmp48_, RESOURCES_ENHANCE);
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp49_ = self->priv->enhance_button;
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp50_ = self->priv->enhance_button;
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp51_ = self->priv->enhance_button;
+#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp50_);
+	_tmp52_ = self->priv->enhance_button;
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	separator = _tmp50_;
-#line 490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp53_);
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	separator = _tmp53_;
+#line 493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_separator_tool_item_set_draw (separator, FALSE);
-#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp51_);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_group = _tmp51_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = _tmp52_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp54_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp55_ = _tmp54_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp53_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out = _tmp55_;
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_ = (GtkEventBox*) gtk_event_box_new ();
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp56_);
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out_box = _tmp56_;
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_group = _tmp54_;
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp55_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp56_ = _tmp55_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp57_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp56_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp57_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp58_ = _tmp57_;
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp56_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out = _tmp58_;
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp59_ = (GtkEventBox*) gtk_event_box_new ();
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp59_);
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out_box = _tmp59_;
+#line 502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_out_box, TRUE);
-#line 500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_visible_window (zoom_out_box, FALSE);
-#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget));
-#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0);
-#line 505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp57_);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = _tmp57_;
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp59_);
 #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp60_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp60_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp61_ = _tmp60_;
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp62_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp61_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp62_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_slider);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->zoom_slider = _tmp59_;
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp58_);
-#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60_ = self->priv->zoom_slider;
-#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_scale_set_draw_value (_tmp60_, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp61_ = self->priv->zoom_slider;
-#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_ = self->priv->zoom_slider;
+	self->priv->zoom_slider = _tmp62_;
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+	_g_object_unref0 (_tmp61_);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp63_ = self->priv->zoom_slider;
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+	gtk_scale_set_draw_value (_tmp63_, FALSE);
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp64_ = self->priv->zoom_slider;
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp65_ = self->priv->zoom_slider;
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp66_ = self->priv->zoom_slider;
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp67_ = self->priv->zoom_slider;
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_ = _tmp67_;
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp69_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp70_ = _tmp69_;
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp68_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in = _tmp70_;
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_ = (GtkEventBox*) gtk_event_box_new ();
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp71_);
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in_box = _tmp71_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp68_ = self->priv->zoom_slider;
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
+#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp69_ = self->priv->zoom_slider;
+#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp70_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp71_ = _tmp70_;
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp72_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp71_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp72_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp73_ = _tmp72_;
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp71_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in = _tmp73_;
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp74_ = (GtkEventBox*) gtk_event_box_new ();
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp74_);
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in_box = _tmp74_;
+#line 524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_in_box, TRUE);
-#line 522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_visible_window (zoom_in_box, FALSE);
-#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget));
-#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0);
-#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = gtk_tool_item_new ();
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp72_);
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	group_wrapper = _tmp72_;
 #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, group_wrapper, -1);
-#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = self->priv->prev_button;
-#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_ = _ ("Previous photo");
+	_tmp75_ = gtk_tool_item_new ();
+#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp75_);
+#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	group_wrapper = _tmp75_;
+#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
 #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _tmp74_);
-#line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp75_ = self->priv->prev_button;
-#line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp75_, "go-previous");
-#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, group_wrapper, -1);
+#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp76_ = self->priv->prev_button;
-#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp76_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_ = self->priv->prev_button;
+	_tmp77_ = _ ("Previous photo");
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_);
+#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp78_ = self->priv->prev_button;
+#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (_tmp78_, "go-previous");
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp79_ = self->priv->prev_button;
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78_ = self->priv->next_button;
+	_tmp80_ = self->priv->prev_button;
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = _ ("Next photo");
-#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_tool_item_get_type (), GtkToolItem), _tmp79_);
-#line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_ = self->priv->next_button;
-#line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp80_, "go-next");
-#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp81_ = self->priv->next_button;
-#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp82_ = self->priv->next_button;
+	_tmp82_ = _ ("Next photo");
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_tool_item_get_type (), GtkToolItem), _tmp82_);
+#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp83_ = self->priv->next_button;
+#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (_tmp83_, "go-next");
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp84_ = self->priv->next_button;
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp84_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+#line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp85_ = self->priv->next_button;
+#line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (group_wrapper);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4971,7 +4987,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 4971 "PhotoPage.c"
+#line 4987 "PhotoPage.c"
 }
 
 
@@ -4981,63 +4997,63 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	gboolean _tmp3_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_);
-#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
-#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 4995 "PhotoPage.c"
+#line 5011 "PhotoPage.c"
 		ZoomState _tmp4_ = {0};
 		gboolean _tmp5_ = FALSE;
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = new_zoom_state;
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
-#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
-#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5006 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 			ZoomState _tmp6_ = {0};
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 5012 "PhotoPage.c"
+#line 5028 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_is_default (&new_zoom_state);
-#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_) {
-#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5022 "PhotoPage.c"
+#line 5038 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_ = {0};
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5029 "PhotoPage.c"
+#line 5045 "PhotoPage.c"
 		}
-#line 568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5033 "PhotoPage.c"
+#line 5049 "PhotoPage.c"
 	}
-#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5037 "PhotoPage.c"
+#line 5053 "PhotoPage.c"
 }
 
 
@@ -5046,40 +5062,40 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->enable_interactive_zoom_refresh = TRUE;
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5062 "PhotoPage.c"
+#line 5078 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5073 "PhotoPage.c"
+#line 5089 "PhotoPage.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5079 "PhotoPage.c"
+#line 5095 "PhotoPage.c"
 }
 
 
@@ -5093,86 +5109,86 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	GtkScale* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
 	ZoomState _tmp8_ = {0};
-#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->enable_interactive_zoom_refresh = FALSE;
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5109 "PhotoPage.c"
+#line 5125 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5120 "PhotoPage.c"
+#line 5136 "PhotoPage.c"
 	}
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->zoom_slider;
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_);
-#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state;
-#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 593 "/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 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5140 "PhotoPage.c"
+#line 5156 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min (self);
-#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5156 "PhotoPage.c"
+#line 5172 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max (self);
-#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5172 "PhotoPage.c"
+#line 5188 "PhotoPage.c"
 }
 
 
@@ -5206,85 +5222,85 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	GdkRectangle _tmp23_ = {0};
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.x = 0;
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas = _tmp0_;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_->x;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas.x = (gint) _tmp2_;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->y;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas.y = (gint) _tmp4_;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/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 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_);
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_wrt_canvas = _tmp6_;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_.x = 0;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_ = _tmp7_;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = cursor_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_.x;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_.x;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp9_ - _tmp11_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _result_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.x;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = viewport_wrt_canvas;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = _tmp14_.width;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = CLAMP (_tmp13_, 0, _tmp15_);
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp16_;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = cursor_wrt_canvas;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_.y;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = viewport_wrt_canvas;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_.y;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.y = _tmp18_ - _tmp20_;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = _result_;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_.y;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = viewport_wrt_canvas;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_.height;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = CLAMP (_tmp22_, 0, _tmp24_);
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.y = _tmp25_;
-#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _result_;
-#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5284 "PhotoPage.c"
+#line 5300 "PhotoPage.c"
 }
 
 
@@ -5304,49 +5320,49 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	GdkPoint _tmp9_ = {0};
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_);
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport = _tmp1_;
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_);
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_wrt_canvas = _tmp3_;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_.x = 0;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp4_;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = viewport_wrt_canvas;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_.width;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center.x = _tmp6_ / 2;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = viewport_wrt_canvas;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.height;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center.y = _tmp8_ / 2;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = cursor_wrt_viewport;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp9_, &_tmp10_, &_tmp11_);
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp11_;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5346 "PhotoPage.c"
+#line 5362 "PhotoPage.c"
 }
 
 
@@ -5366,45 +5382,45 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
 	GdkPoint _tmp12_ = {0};
-#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&_tmp0_, &_tmp1_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = zoom_state_get_zoom_factor (&_tmp2_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center_iso = _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	viewport_center_iso = _tmp4_;
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state_get_zoom_factor (&_tmp7_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_center_iso = _tmp9_;
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	cursor_wrt_center_iso = _tmp9_;
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center_iso;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = cursor_wrt_center_iso;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	add_points (&_tmp10_, &_tmp11_, &_tmp12_);
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp12_;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5404 "PhotoPage.c"
+#line 5420 "PhotoPage.c"
 }
 
 
@@ -5412,33 +5428,33 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	gdouble result = 0.0;
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = interp;
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ < 0.03) {
-#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5420 "PhotoPage.c"
+#line 5436 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_ = 0.0;
-#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = interp;
-#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp1_ > 0.97) {
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5429 "PhotoPage.c"
+#line 5445 "PhotoPage.c"
 		}
 	}
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = interp;
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5438 "PhotoPage.c"
+#line 5454 "PhotoPage.c"
 }
 
 
@@ -5448,21 +5464,21 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
-#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = adjustment;
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5462 "PhotoPage.c"
+#line 5478 "PhotoPage.c"
 }
 
 
@@ -5497,127 +5513,127 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	ZoomState _tmp21_ = {0};
 	GdkPoint _tmp22_ = {0};
 	ZoomState _tmp23_ = {0};
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5507 "PhotoPage.c"
+#line 5523 "PhotoPage.c"
 	}
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_);
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport_center = _tmp2_;
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_);
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	iso_pixel_under_cursor = _tmp4_;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = zoom_increment;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_);
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	interp = _tmp6_;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.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_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->zoom_slider;
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = interp;
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_);
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->zoom_slider;
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_);
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = interp;
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_);
-#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = zoom_state_is_min (&new_zoom_state);
-#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_update_cursor_for_zoom_context (self);
-#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5561 "PhotoPage.c"
+#line 5577 "PhotoPage.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state);
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp15_, _tmp16_, &_tmp17_);
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_zoomed_old_cursor = _tmp17_;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = new_zoomed_old_cursor;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = cursor_wrt_viewport_center;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp18_, &_tmp19_, &_tmp20_);
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	desired_new_viewport_center = _tmp20_;
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	desired_new_viewport_center = _tmp20_;
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = new_zoom_state;
-#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = desired_new_viewport_center;
-#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_);
-#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = new_zoom_state;
-#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5593 "PhotoPage.c"
+#line 5609 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5605 "PhotoPage.c"
+#line 5621 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5617 "PhotoPage.c"
+#line 5633 "PhotoPage.c"
 }
 
 
@@ -5626,19 +5642,19 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	ZoomState _tmp0_ = {0};
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
-#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale_to_isomorphic (&iso_state, &_tmp0_);
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5638 "PhotoPage.c"
+#line 5654 "PhotoPage.c"
 }
 
 
@@ -5649,154 +5665,154 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5681 "PhotoPage.c"
+#line 5697 "PhotoPage.c"
 			default:
 			{
-#line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5690 "PhotoPage.c"
+#line 5706 "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"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5696 "PhotoPage.c"
+#line 5712 "PhotoPage.c"
 			default:
 			{
-#line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5705 "PhotoPage.c"
+#line 5721 "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"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5711 "PhotoPage.c"
+#line 5727 "PhotoPage.c"
 			default:
 			{
-#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100");
-#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5720 "PhotoPage.c"
+#line 5736 "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"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5726 "PhotoPage.c"
+#line 5742 "PhotoPage.c"
 			default:
 			{
-#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit");
-#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5735 "PhotoPage.c"
+#line 5751 "PhotoPage.c"
 			}
 		}
 	}
-#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5743 "PhotoPage.c"
+#line 5759 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5752 "PhotoPage.c"
+#line 5768 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5765 "PhotoPage.c"
+#line 5781 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_increase_size (EditingHostPage* self) {
-#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5774 "PhotoPage.c"
+#line 5790 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5787 "PhotoPage.c"
+#line 5803 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_decrease_size (EditingHostPage* self) {
-#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5796 "PhotoPage.c"
+#line 5812 "PhotoPage.c"
 }
 
 
@@ -5804,17 +5820,17 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_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"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5814 "PhotoPage.c"
+#line 5830 "PhotoPage.c"
 }
 
 
@@ -5823,17 +5839,17 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	ZoomBuffer* result = NULL;
 	ZoomBuffer* _tmp0_ = NULL;
 	ZoomBuffer* _tmp1_ = NULL;
-#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_buffer;
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5833 "PhotoPage.c"
+#line 5849 "PhotoPage.c"
 }
 
 
@@ -5844,47 +5860,47 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/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 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5856 "PhotoPage.c"
+#line 5872 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5866 "PhotoPage.c"
+#line 5882 "PhotoPage.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5874 "PhotoPage.c"
+#line 5890 "PhotoPage.c"
 	}
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5884 "PhotoPage.c"
+#line 5900 "PhotoPage.c"
 }
 
 
@@ -5895,47 +5911,47 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/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 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_min (&_tmp1_);
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5907 "PhotoPage.c"
+#line 5923 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5917 "PhotoPage.c"
+#line 5933 "PhotoPage.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5925 "PhotoPage.c"
+#line 5941 "PhotoPage.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5935 "PhotoPage.c"
+#line 5951 "PhotoPage.c"
 }
 
 
@@ -5946,40 +5962,40 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	GtkScale* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
 	GtkScale* _tmp4_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->saved_slider_val;
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->zoom_slider;
-#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 5966 "PhotoPage.c"
+#line 5982 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5979 "PhotoPage.c"
+#line 5995 "PhotoPage.c"
 }
 
 
@@ -5987,27 +6003,27 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	EditingHostPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = container;
-#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
 #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = container;
-#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 5999 "PhotoPage.c"
+#line 6015 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6007 "PhotoPage.c"
+#line 6023 "PhotoPage.c"
 	}
 }
 
@@ -6016,17 +6032,17 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->parent_view;
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6026 "PhotoPage.c"
+#line 6042 "PhotoPage.c"
 }
 
 
@@ -6035,21 +6051,21 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	Photo* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6049 "PhotoPage.c"
+#line 6065 "PhotoPage.c"
 }
 
 
@@ -6068,57 +6084,57 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	DataView* _tmp10_ = NULL;
 	DataSource* _tmp11_ = NULL;
 	Photo* _tmp12_ = NULL;
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6086 "PhotoPage.c"
+#line 6102 "PhotoPage.c"
 	}
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1");
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_view_get_source (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6118 "PhotoPage.c"
+#line 6134 "PhotoPage.c"
 }
 
 
@@ -6126,50 +6142,50 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	Photo* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_PHOTO (new_photo));
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_PHOTO (new_photo));
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = new_photo;
-#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_get_file_format (_tmp0_);
-#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6136 "PhotoPage.c"
+#line 6152 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = new_photo;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, !_tmp5_);
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6154 "PhotoPage.c"
+#line 6170 "PhotoPage.c"
 	}
-#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6160 "PhotoPage.c"
+#line 6176 "PhotoPage.c"
 }
 
 
 void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) {
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6169 "PhotoPage.c"
+#line 6185 "PhotoPage.c"
 }
 
 
@@ -6198,148 +6214,148 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	ViewCollection* _tmp19_ = NULL;
 	Marker* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_photo_changing (self, _tmp4_);
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp9_;
-#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view;
-#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp10_ != NULL, "view != null");
 #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_assert (_tmp10_ != NULL, "view != null");
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_unselect_all (_tmp12_);
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp12_);
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = view;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	marker = _tmp17_;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = marker;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_select_marked (_tmp19_, _tmp20_);
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp19_);
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->parent_view;
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6274 "PhotoPage.c"
+#line 6290 "PhotoPage.c"
 		ViewCollection* _tmp22_ = NULL;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		DataView* _tmp25_ = NULL;
 		DataView* _tmp26_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_view;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_unselect_all (_tmp22_);
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->parent_view;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource));
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_in_parent = _tmp25_;
-#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = view_in_parent;
-#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6297 "PhotoPage.c"
+#line 6313 "PhotoPage.c"
 			ViewCollection* _tmp27_ = NULL;
 			ViewCollection* _tmp28_ = NULL;
 			DataView* _tmp29_ = NULL;
 			Marker* _tmp30_ = NULL;
 			Marker* _tmp31_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = self->priv->parent_view;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = self->priv->parent_view;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = view_in_parent;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp31_ = _tmp30_;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view_collection_select_marked (_tmp27_, _tmp31_);
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6317 "PhotoPage.c"
+#line 6333 "PhotoPage.c"
 		}
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6321 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6327 "PhotoPage.c"
+#line 6343 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_realize (GtkWidget* base) {
 	EditingHostPage * self;
-#line 837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6339 "PhotoPage.c"
+#line 6355 "PhotoPage.c"
 }
 
 
@@ -6347,42 +6363,42 @@ static void editing_host_page_real_switched_to (Page* base) {
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_rebuild_caches (self, "switched_to");
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_rebuild_caches (self, "switched_to");
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6357 "PhotoPage.c"
+#line 6373 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6363 "PhotoPage.c"
+#line 6379 "PhotoPage.c"
 	} else {
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6367 "PhotoPage.c"
+#line 6383 "PhotoPage.c"
 	}
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6371 "PhotoPage.c"
+#line 6387 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_replace_photo (self, _tmp4_);
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6382 "PhotoPage.c"
+#line 6398 "PhotoPage.c"
 	}
 }
 
@@ -6394,37 +6410,37 @@ static void editing_host_page_real_switching_from (Page* base) {
 	gboolean _tmp2_ = FALSE;
 	ViewCollection* _tmp13_ = NULL;
 	ViewCollection* _tmp14_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_pan_in_progress = FALSE;
-#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6410 "PhotoPage.c"
+#line 6426 "PhotoPage.c"
 		ViewCollection* _tmp3_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6416 "PhotoPage.c"
+#line 6432 "PhotoPage.c"
 	} else {
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6420 "PhotoPage.c"
+#line 6436 "PhotoPage.c"
 	}
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6424 "PhotoPage.c"
+#line 6440 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6434,54 +6450,54 @@ static void editing_host_page_real_switching_from (Page* base) {
 		DataView* _tmp10_ = NULL;
 		Marker* _tmp11_ = NULL;
 		Marker* _tmp12_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource));
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_select_marked (_tmp4_, _tmp12_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6460 "PhotoPage.c"
+#line 6476 "PhotoPage.c"
 	}
-#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6474 "PhotoPage.c"
+#line 6490 "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"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6481 "PhotoPage.c"
+#line 6497 "PhotoPage.c"
 }
 
 
@@ -6493,51 +6509,51 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	FullscreenWindow* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_pan_in_progress = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fsw;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp3_;
-#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page;
-#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6519 "PhotoPage.c"
+#line 6535 "PhotoPage.c"
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6533 "PhotoPage.c"
+#line 6549 "PhotoPage.c"
 	}
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6537 "PhotoPage.c"
+#line 6553 "PhotoPage.c"
 }
 
 
@@ -6548,107 +6564,107 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	FullscreenWindow* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = fsw;
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp2_;
-#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page;
-#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6568 "PhotoPage.c"
+#line 6584 "PhotoPage.c"
 		Page* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		guint _tmp7_ = 0U;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_view (_tmp4_);
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6585 "PhotoPage.c"
+#line 6601 "PhotoPage.c"
 	}
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6589 "PhotoPage.c"
+#line 6605 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) {
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6598 "PhotoPage.c"
+#line 6614 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = selected;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_view_it = _tmp1_;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6611 "PhotoPage.c"
+#line 6627 "PhotoPage.c"
 			gboolean _tmp2_ = FALSE;
 			DataView* view = NULL;
 			gpointer _tmp3_ = NULL;
 			DataView* _tmp4_ = NULL;
 			DataSource* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = gee_iterator_next (_view_it);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp2_) {
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6624 "PhotoPage.c"
+#line 6640 "PhotoPage.c"
 			}
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view = (DataView*) _tmp3_;
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = view;
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = data_view_get_source (_tmp4_);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp6_);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (view);
-#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6644 "PhotoPage.c"
+#line 6660 "PhotoPage.c"
 		}
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6648 "PhotoPage.c"
+#line 6664 "PhotoPage.c"
 	}
 }
 
@@ -6656,31 +6672,31 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
 	GtkToolButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = should_enable;
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6664 "PhotoPage.c"
+#line 6680 "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"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6671 "PhotoPage.c"
+#line 6687 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) {
 	gboolean result;
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6680 "PhotoPage.c"
+#line 6696 "PhotoPage.c"
 }
 
 
@@ -6701,118 +6717,118 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	Scaling _tmp19_ = {0};
 	PixbufCache* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp0_;
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	scaling = _tmp0_;
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->cache;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6713 "PhotoPage.c"
+#line 6729 "PhotoPage.c"
 		PixbufCache* _tmp3_ = NULL;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->cache;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_get_scaling (_tmp3_, &_tmp4_);
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = scaling;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6728 "PhotoPage.c"
+#line 6744 "PhotoPage.c"
 	} else {
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6732 "PhotoPage.c"
+#line 6748 "PhotoPage.c"
 	}
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6738 "PhotoPage.c"
+#line 6754 "PhotoPage.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scaling_to_string (&scaling);
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:918: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp9_);
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->cache;
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6754 "PhotoPage.c"
+#line 6770 "PhotoPage.c"
 		PixbufCache* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		PixbufCache* _tmp13_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = self->priv->cache;
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE);
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self);
-#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->cache;
-#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6768 "PhotoPage.c"
+#line 6784 "PhotoPage.c"
 	}
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling;
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL);
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cache);
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cache = _tmp16_;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->cache;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->sources;
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = scaling;
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->master_cache);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->master_cache = _tmp20_;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->master_cache = _tmp20_;
+#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = caller;
-#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6798 "PhotoPage.c"
+#line 6814 "PhotoPage.c"
 }
 
 
 static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
 	gboolean _tmp0_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6812 "PhotoPage.c"
+#line 6828 "PhotoPage.c"
 		const gchar* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -6822,45 +6838,45 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		ViewCollection* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Photo* _tmp9_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = caller;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:939: Refresh pixbuf caches (%s): prefetching neighbors " \
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:942: Refresh pixbuf caches (%s): prefetching neighbors " \
 "of %s", _tmp1_, _tmp5_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (self);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6852 "PhotoPage.c"
+#line 6868 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 946 "/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 6859 "PhotoPage.c"
+#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
+#line 6875 "PhotoPage.c"
 	}
 }
 
@@ -6870,35 +6886,35 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_has_transformations (_tmp1_);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6881 "PhotoPage.c"
+#line 6897 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = photo_has_editable (_tmp3_);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6891 "PhotoPage.c"
+#line 6907 "PhotoPage.c"
 	}
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6897 "PhotoPage.c"
+#line 6913 "PhotoPage.c"
 }
 
 
@@ -6910,35 +6926,35 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	gboolean _tmp4_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = photo;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource));
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6931 "PhotoPage.c"
+#line 6947 "PhotoPage.c"
 	}
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6937 "PhotoPage.c"
+#line 6953 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_ = NULL;
 		Dimensions max_dim = {0};
@@ -6948,62 +6964,62 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
 		Photo* _tmp33_ = NULL;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->zoom_buffer;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6951 "PhotoPage.c"
+#line 6967 "PhotoPage.c"
 			ZoomBuffer* _tmp8_ = NULL;
 			Photo* _tmp9_ = NULL;
 			Photo* _tmp10_ = NULL;
 			Photo* _tmp11_ = NULL;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = self->priv->zoom_buffer;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = zoom_buffer_get_backing_photo (_tmp8_);
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = photo;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp10_ == _tmp11_;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6968 "PhotoPage.c"
+#line 6984 "PhotoPage.c"
 		} else {
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6972 "PhotoPage.c"
+#line 6988 "PhotoPage.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6976 "PhotoPage.c"
+#line 6992 "PhotoPage.c"
 			Photo* _tmp12_ = NULL;
 			GdkPixbuf* _tmp13_ = NULL;
 			ZoomBuffer* _tmp14_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = photo;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_);
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (self->priv->zoom_buffer);
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 6990 "PhotoPage.c"
+#line 7006 "PhotoPage.c"
 		}
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		max_dim = _tmp16_;
-#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = self->priv->current_tool;
-#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7002 "PhotoPage.c"
+#line 7018 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7013,46 +7029,46 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				Dimensions _tmp21_ = {0};
 				GdkPixbuf* _tmp22_ = NULL;
 				GdkPixbuf* _tmp23_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = self->priv->current_tool;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_);
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = photo;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf_dim = _tmp21_;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf = _tmp22_;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7026 "PhotoPage.c"
-					goto __catch243_g_error;
+#line 7042 "PhotoPage.c"
+					goto __catch244_g_error;
 				}
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7033 "PhotoPage.c"
+#line 7049 "PhotoPage.c"
 					GdkPixbuf* _tmp24_ = NULL;
 					Dimensions _tmp25_ = {0};
-#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp24_ = tool_pixbuf;
-#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					pixbuf = _tmp24_;
-#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp25_ = tool_pixbuf_dim;
-#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7044 "PhotoPage.c"
+#line 7060 "PhotoPage.c"
 				}
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7048 "PhotoPage.c"
+#line 7064 "PhotoPage.c"
 			}
-			goto __finally243;
-			__catch243_g_error:
+			goto __finally244;
+			__catch244_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_ = NULL;
@@ -7060,72 +7076,72 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				gchar* _tmp28_ = NULL;
 				GError* _tmp29_ = NULL;
 				const gchar* _tmp30_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				err = _inner_error_;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_inner_error_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp26_ = photo;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject));
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp28_ = _tmp27_;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp29_ = err;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp30_ = _tmp29_->message;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_warning ("PhotoPage.vala:975: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_free0 (_tmp28_);
-#line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				editing_host_page_set_photo_missing (self, TRUE);
-#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_error_free0 (err);
-#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7083 "PhotoPage.c"
+#line 7099 "PhotoPage.c"
 			}
-			__finally243:
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			__finally244:
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/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 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_clear_error (&_inner_error_);
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7094 "PhotoPage.c"
+#line 7110 "PhotoPage.c"
 			}
 		}
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = pixbuf;
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = max_dim;
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL);
-#line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = photo;
-#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7109 "PhotoPage.c"
+#line 7125 "PhotoPage.c"
 	} else {
 		GError* _tmp34_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
-#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7116 "PhotoPage.c"
+#line 7132 "PhotoPage.c"
 			Photo* _tmp35_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_set_photo_missing (self, TRUE);
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			editing_host_page_set_photo_missing (self, TRUE);
+#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = photo;
-#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7124 "PhotoPage.c"
+#line 7140 "PhotoPage.c"
 		}
 	}
 }
@@ -7157,73 +7173,73 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	PixbufCachePixbufCacheBatch* _tmp40_ = NULL;
 	PixbufCache* _tmp41_ = NULL;
 	PixbufCachePixbufCacheBatch* _tmp42_ = NULL;
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	normal_batch = _tmp0_;
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	master_batch = _tmp1_;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = normal_batch;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_);
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = master_batch;
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo;
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
 #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = controller;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next_source = _tmp8_;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev_source = _tmp9_;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp10_) {
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (prev_source);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (next_source);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (master_batch);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (normal_batch);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7208 "PhotoPage.c"
+#line 7224 "PhotoPage.c"
 	}
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo));
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = prev_source;
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7222 "PhotoPage.c"
+#line 7238 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_ = NULL;
@@ -7232,25 +7248,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		GeeSet* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_neighbor_source_it = _tmp20_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7249 "PhotoPage.c"
+#line 7265 "PhotoPage.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			DataSource* neighbor_source = NULL;
@@ -7269,110 +7285,110 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			Photo* _tmp36_ = NULL;
 			PixbufCachePixbufCacheBatch* _tmp37_ = NULL;
 			Photo* _tmp38_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = _neighbor_source_it;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp22_) {
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7276 "PhotoPage.c"
+#line 7292 "PhotoPage.c"
 			}
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			neighbor_source = (DataSource*) _tmp24_;
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = neighbor_source;
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			neighbor = _tmp26_;
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = neighbor;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = next;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource));
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp30_) {
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7302 "PhotoPage.c"
+#line 7318 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				gboolean _tmp33_ = FALSE;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp31_ = neighbor;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp32_ = prev;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_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"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7315 "PhotoPage.c"
+#line 7331 "PhotoPage.c"
 			}
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7321 "PhotoPage.c"
+#line 7337 "PhotoPage.c"
 			}
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = priority;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp36_ = neighbor;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_);
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp37_ = master_batch;
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp38_ = neighbor;
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7341 "PhotoPage.c"
+#line 7357 "PhotoPage.c"
 		}
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7345 "PhotoPage.c"
+#line 7361 "PhotoPage.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = normal_batch;
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE);
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->master_cache;
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = master_batch;
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (master_batch);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7371 "PhotoPage.c"
+#line 7387 "PhotoPage.c"
 }
 
 
@@ -7389,46 +7405,46 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	GeeSet* _tmp24_ = NULL;
 	Photo* _tmp25_ = NULL;
 	gboolean _tmp26_ = FALSE;
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (old_controller));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (old_photo));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (new_controller));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = old_controller;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet);
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = new_controller;
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = new_photo;
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_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"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7414 "PhotoPage.c"
+#line 7430 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_ = NULL;
 		GeeIterator* _tmp7_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = old_neighbors;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_old_neighbor_it = _tmp7_;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7427 "PhotoPage.c"
+#line 7443 "PhotoPage.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Photo* old_neighbor = NULL;
@@ -7438,129 +7454,129 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			GeeSet* _tmp13_ = NULL;
 			Photo* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _old_neighbor_it;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp9_) {
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7445 "PhotoPage.c"
+#line 7461 "PhotoPage.c"
 			}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			old_neighbor = (Photo*) _tmp11_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			old_neighbor = (Photo*) _tmp11_;
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = new_neighbors;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = old_neighbor;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7461 "PhotoPage.c"
+#line 7477 "PhotoPage.c"
 				Photo* _tmp16_ = NULL;
 				Photo* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp16_ = new_photo;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp17_ = old_neighbor;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_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"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7473 "PhotoPage.c"
+#line 7489 "PhotoPage.c"
 			} else {
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7477 "PhotoPage.c"
+#line 7493 "PhotoPage.c"
 			}
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7481 "PhotoPage.c"
+#line 7497 "PhotoPage.c"
 				PixbufCache* _tmp19_ = NULL;
 				Photo* _tmp20_ = NULL;
 				PixbufCache* _tmp21_ = NULL;
 				Photo* _tmp22_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp19_ = self->priv->cache;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = old_neighbor;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp19_, _tmp20_);
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp21_ = self->priv->master_cache;
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = old_neighbor;
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7498 "PhotoPage.c"
+#line 7514 "PhotoPage.c"
 			}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7502 "PhotoPage.c"
+#line 7518 "PhotoPage.c"
 		}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7506 "PhotoPage.c"
+#line 7522 "PhotoPage.c"
 	}
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = old_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7516 "PhotoPage.c"
+#line 7532 "PhotoPage.c"
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = new_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = old_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_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"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7528 "PhotoPage.c"
+#line 7544 "PhotoPage.c"
 	} else {
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7532 "PhotoPage.c"
+#line 7548 "PhotoPage.c"
 	}
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7536 "PhotoPage.c"
+#line 7552 "PhotoPage.c"
 		PixbufCache* _tmp30_ = NULL;
 		Photo* _tmp31_ = NULL;
 		PixbufCache* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = self->priv->cache;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = old_photo;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp30_, _tmp31_);
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = self->priv->master_cache;
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = old_photo;
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7553 "PhotoPage.c"
+#line 7569 "PhotoPage.c"
 	}
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7559 "PhotoPage.c"
+#line 7575 "PhotoPage.c"
 }
 
 
@@ -7568,61 +7584,61 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	PhotoView* _tmp1_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7577 "PhotoPage.c"
+#line 7593 "PhotoPage.c"
 }
 
 
 DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) {
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7586 "PhotoPage.c"
+#line 7602 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7603 "PhotoPage.c"
+#line 7619 "PhotoPage.c"
 }
 
 
 static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) {
 	DataView* result;
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7612 "PhotoPage.c"
+#line 7628 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) {
 	gboolean result;
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7621 "PhotoPage.c"
+#line 7637 "PhotoPage.c"
 }
 
 
@@ -7637,54 +7653,54 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7666 "PhotoPage.c"
+#line 7682 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7675 "PhotoPage.c"
+#line 7691 "PhotoPage.c"
 	} else {
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7679 "PhotoPage.c"
+#line 7695 "PhotoPage.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7683 "PhotoPage.c"
+#line 7699 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7692,39 +7708,39 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7717 "PhotoPage.c"
+#line 7733 "PhotoPage.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7723 "PhotoPage.c"
+#line 7739 "PhotoPage.c"
 }
 
 
@@ -7739,54 +7755,54 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7768 "PhotoPage.c"
+#line 7784 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7777 "PhotoPage.c"
+#line 7793 "PhotoPage.c"
 	} else {
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7781 "PhotoPage.c"
+#line 7797 "PhotoPage.c"
 	}
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7785 "PhotoPage.c"
+#line 7801 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7794,39 +7810,39 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7819 "PhotoPage.c"
+#line 7835 "PhotoPage.c"
 	}
-#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7825 "PhotoPage.c"
+#line 7841 "PhotoPage.c"
 }
 
 
@@ -7841,68 +7857,68 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	GtkToolButton* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	Dimensions _tmp8_ = {0};
-#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->crop_button;
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->straighten_button;
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->redeye_button;
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->adjust_button;
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->enhance_button;
-#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp8_, 0, 0);
-#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7876 "PhotoPage.c"
+#line 7892 "PhotoPage.c"
 }
 
 
 void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
-#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7885 "PhotoPage.c"
+#line 7901 "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"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7892 "PhotoPage.c"
+#line 7908 "PhotoPage.c"
 }
 
 
 void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
-#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7901 "PhotoPage.c"
+#line 7917 "PhotoPage.c"
 }
 
 
@@ -7932,91 +7948,91 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	PangoLayout* _tmp18_ = NULL;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (message != NULL);
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = message;
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pango_layout = _tmp1_;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pango_layout;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	text_width = _tmp3_;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	text_height = _tmp4_;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	text_height = _tmp4_;
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_);
-#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	allocation = _tmp5_;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = allocation;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_.width;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = text_width;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp7_ - _tmp8_;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = x;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7965 "PhotoPage.c"
+#line 7981 "PhotoPage.c"
 		gint _tmp11_ = 0;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7971 "PhotoPage.c"
+#line 7987 "PhotoPage.c"
 	} else {
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7975 "PhotoPage.c"
+#line 7991 "PhotoPage.c"
 	}
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = allocation;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.height;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = text_height;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp13_ - _tmp14_;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 7991 "PhotoPage.c"
+#line 8007 "PhotoPage.c"
 		gint _tmp17_ = 0;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 7997 "PhotoPage.c"
+#line 8013 "PhotoPage.c"
 	} else {
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8001 "PhotoPage.c"
+#line 8017 "PhotoPage.c"
 	}
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = pango_layout;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8015 "PhotoPage.c"
+#line 8031 "PhotoPage.c"
 }
 
 
@@ -8030,45 +8046,45 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8039 "PhotoPage.c"
+#line 8055 "PhotoPage.c"
 	}
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->photo_missing = _tmp2_;
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp3_;
-#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ == NULL) {
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8057 "PhotoPage.c"
+#line 8073 "PhotoPage.c"
 	}
-#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
-#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp5_);
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8067 "PhotoPage.c"
+#line 8083 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_ = NULL;
@@ -8083,49 +8099,49 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			GdkPixbuf* _tmp16_ = NULL;
 			Photo* _tmp17_ = NULL;
 			Dimensions _tmp18_ = {0};
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = photo;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp9_;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8092 "PhotoPage.c"
-				goto __catch244_g_error;
+#line 8108 "PhotoPage.c"
+				goto __catch245_g_error;
 			}
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp15_;
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			pixbuf = _tmp15_;
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = pixbuf;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = photo;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			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"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8121 "PhotoPage.c"
+#line 8137 "PhotoPage.c"
 		}
-		goto __finally244;
-		__catch244_g_error:
+		goto __finally245;
+		__catch245_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -8134,87 +8150,87 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			Dimensions _tmp22_ = {0};
 			GError* _tmp23_ = NULL;
 			const gchar* _tmp24_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = _tmp19_;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = photo;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp20_);
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = err;
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = _tmp23_->message;
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1142: %s", _tmp24_);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8157 "PhotoPage.c"
+#line 8173 "PhotoPage.c"
 		}
-		__finally244:
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally245:
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (photo);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/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 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8170 "PhotoPage.c"
+#line 8186 "PhotoPage.c"
 		}
 	}
-#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8175 "PhotoPage.c"
+#line 8191 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8190 "PhotoPage.c"
+#line 8206 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
 	gboolean result = FALSE;
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8204 "PhotoPage.c"
+#line 8220 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8213 "PhotoPage.c"
+#line 8229 "PhotoPage.c"
 }
 
 
@@ -8227,121 +8243,121 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), NULL);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_photo;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp2_;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8242 "PhotoPage.c"
+#line 8258 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_ = NULL;
 			Scaling _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = new_photo;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = _tmp7_;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8259 "PhotoPage.c"
-				goto __catch245_g_error;
+#line 8275 "PhotoPage.c"
+				goto __catch246_g_error;
 			}
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp8_;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8272 "PhotoPage.c"
+#line 8288 "PhotoPage.c"
 		}
-		goto __finally245;
-		__catch245_g_error:
+		goto __finally246;
+		__catch246_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_inner_error_ = NULL;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_inner_error_ = NULL;
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = err;
-#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_->message;
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1161: %s", _tmp10_);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8292 "PhotoPage.c"
+#line 8308 "PhotoPage.c"
 		}
-		__finally245:
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally246:
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/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 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8305 "PhotoPage.c"
+#line 8321 "PhotoPage.c"
 		}
 	}
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8312 "PhotoPage.c"
+#line 8328 "PhotoPage.c"
 		GdkPixbuf* _tmp12_ = NULL;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = get_placeholder_pixbuf ();
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf = _tmp12_;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = pixbuf;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE);
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8334 "PhotoPage.c"
+#line 8350 "PhotoPage.c"
 	}
-#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
-#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8340 "PhotoPage.c"
+#line 8356 "PhotoPage.c"
 }
 
 
@@ -8373,240 +8389,240 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	GdkPixbuf* _tmp45_ = NULL;
 	GdkPixbuf* _tmp46_ = NULL;
 	ZoomBuffer* _tmp47_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = new_photo;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/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 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8390 "PhotoPage.c"
+#line 8406 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8396 "PhotoPage.c"
+#line 8412 "PhotoPage.c"
 	} else {
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8400 "PhotoPage.c"
+#line 8416 "PhotoPage.c"
 	}
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8404 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
 		gboolean _tmp8_ = FALSE;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8410 "PhotoPage.c"
+#line 8426 "PhotoPage.c"
 	} else {
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8414 "PhotoPage.c"
+#line 8430 "PhotoPage.c"
 	}
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8418 "PhotoPage.c"
+#line 8434 "PhotoPage.c"
 		Photo* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 		ZoomBuffer* _tmp13_ = NULL;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = new_photo;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = new_photo;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->zoom_buffer);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_buffer = _tmp13_;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8442 "PhotoPage.c"
+#line 8458 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8448 "PhotoPage.c"
+#line 8464 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
 		Photo* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = new_photo;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource));
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = !_tmp20_;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8465 "PhotoPage.c"
+#line 8481 "PhotoPage.c"
 	} else {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8469 "PhotoPage.c"
+#line 8485 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8475 "PhotoPage.c"
+#line 8491 "PhotoPage.c"
 	} else {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8479 "PhotoPage.c"
+#line 8495 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8483 "PhotoPage.c"
+#line 8499 "PhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		Photo* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (self);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = new_photo;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = !_tmp24_;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp25_) {
-#line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8505 "PhotoPage.c"
+#line 8521 "PhotoPage.c"
 		}
 	}
-#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp26_, 0, 0);
-#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
+#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = editing_host_page_get_photo (self);
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	old_photo = _tmp27_;
-#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = new_photo;
-#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo (self, _tmp28_);
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = new_photo;
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = _tmp30_;
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_);
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp31_);
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_free0 (_tmp31_);
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->swapped = NULL;
 #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->swapped = NULL;
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp32_ = new_photo;
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = _tmp33_;
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = g_file_query_exists (_tmp34_, NULL);
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, !_tmp35_);
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "replace_photo");
-#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp36_ = old_photo;
-#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8554 "PhotoPage.c"
+#line 8570 "PhotoPage.c"
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
 		Photo* _tmp39_ = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
 		Photo* _tmp42_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = old_photo;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = _tmp40_;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = new_photo;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_);
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8579 "PhotoPage.c"
+#line 8595 "PhotoPage.c"
 	}
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = new_photo;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = new_photo;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = _tmp45_;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_buffer);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->zoom_buffer = _tmp47_;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_quick_update_pixbuf (self);
 #line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_quick_update_pixbuf (self);
+#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "replace_photo");
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8605 "PhotoPage.c"
+#line 8621 "PhotoPage.c"
 }
 
 
@@ -8621,84 +8637,84 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp12_ = FALSE;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_ != NULL;
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8648 "PhotoPage.c"
+#line 8664 "PhotoPage.c"
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 		Dimensions _tmp10_ = {0};
 		ZoomState _tmp11_ = {0};
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init (&_tmp11_, &_tmp9_, &_tmp10_, 0.0, NULL);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8668 "PhotoPage.c"
+#line 8684 "PhotoPage.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/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"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8674 "PhotoPage.c"
+#line 8690 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_ = NULL;
 		GdkWindow* _tmp15_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8683 "PhotoPage.c"
+#line 8699 "PhotoPage.c"
 	} else {
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8687 "PhotoPage.c"
+#line 8703 "PhotoPage.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8693 "PhotoPage.c"
+#line 8709 "PhotoPage.c"
 	}
-#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8697 "PhotoPage.c"
+#line 8713 "PhotoPage.c"
 }
 
 
@@ -8722,76 +8738,76 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	Photo* _tmp29_ = NULL;
 	Photo* _tmp30_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp2_);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp4_;
-#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8741 "PhotoPage.c"
+#line 8757 "PhotoPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp6_, &_tmp9_, NULL);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8764 "PhotoPage.c"
+#line 8780 "PhotoPage.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp10_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (self);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling_to_string (&scaling);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:1249: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:1252: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp16_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp14_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8790 "PhotoPage.c"
+#line 8806 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
@@ -8802,87 +8818,87 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		Dimensions _tmp25_ = {0};
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = scaling;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp20_, &_inner_error_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp22_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8817 "PhotoPage.c"
-			goto __catch246_g_error;
+#line 8833 "PhotoPage.c"
+			goto __catch247_g_error;
 		}
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp25_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, &_tmp25_, NULL);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8832 "PhotoPage.c"
+#line 8848 "PhotoPage.c"
 	}
-	goto __finally246;
-	__catch246_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_inner_error_ = NULL;
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_inner_error_ = NULL;
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = err;
-#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = _tmp26_->message;
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1256: %s", _tmp27_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8852 "PhotoPage.c"
+#line 8868 "PhotoPage.c"
 	}
-	__finally246:
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally247:
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/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 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8865 "PhotoPage.c"
+#line 8881 "PhotoPage.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = editing_host_page_get_photo (self);
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_;
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch (_tmp28_, _tmp30_, BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 1263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = FALSE;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8881 "PhotoPage.c"
+#line 8897 "PhotoPage.c"
 }
 
 
@@ -8899,47 +8915,47 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	gboolean _tmp25_ = FALSE;
 	gboolean _tmp26_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp0_;
-#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8914 "PhotoPage.c"
+#line 8930 "PhotoPage.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8924 "PhotoPage.c"
+#line 8940 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
 		EditingToolsEditingTool* _tmp5_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_.width = 0;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp4_;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->current_tool;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8938 "PhotoPage.c"
+#line 8954 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_ = NULL;
 			Scaling _tmp8_ = {0};
@@ -8947,214 +8963,214 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			Dimensions _tmp10_ = {0};
 			GdkPixbuf* _tmp11_ = NULL;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = self->priv->current_tool;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = editing_tools_editing_tool_get_display_pixbuf (_tmp7_, &_tmp8_, _tmp9_, &_tmp10_, &_inner_error_);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			tool_pixbuf_dim = _tmp10_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp11_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8960 "PhotoPage.c"
-				goto __catch247_g_error;
+#line 8976 "PhotoPage.c"
+				goto __catch248_g_error;
 			}
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp12_;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8973 "PhotoPage.c"
+#line 8989 "PhotoPage.c"
 		}
-#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
-#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8979 "PhotoPage.c"
+#line 8995 "PhotoPage.c"
 			Dimensions _tmp14_ = {0};
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 8985 "PhotoPage.c"
+#line 9001 "PhotoPage.c"
 		}
 	}
-	goto __finally247;
-	__catch247_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = err;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1286: %s", _tmp16_);
-#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1289: %s", _tmp16_);
+#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, TRUE);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9008 "PhotoPage.c"
+#line 9024 "PhotoPage.c"
 	}
-	__finally247:
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally248:
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/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 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return FALSE;
-#line 9023 "PhotoPage.c"
+#line 9039 "PhotoPage.c"
 	}
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->photo_missing;
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp17_) {
-#line 9029 "PhotoPage.c"
+#line 9045 "PhotoPage.c"
 		GdkPixbuf* _tmp18_ = NULL;
 		GdkPixbuf* _tmp22_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = pixbuf;
-#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp18_ == NULL) {
-#line 9036 "PhotoPage.c"
+#line 9052 "PhotoPage.c"
 			PixbufCache* _tmp19_ = NULL;
 			Photo* _tmp20_ = NULL;
 			GdkPixbuf* _tmp21_ = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = self->priv->cache;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = photo;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_);
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp21_;
-#line 9050 "PhotoPage.c"
+#line 9066 "PhotoPage.c"
 		}
-#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = pixbuf;
-#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp22_ == NULL) {
-#line 9056 "PhotoPage.c"
+#line 9072 "PhotoPage.c"
 			PixbufCache* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = self->priv->cache;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = photo;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9065 "PhotoPage.c"
+#line 9081 "PhotoPage.c"
 		}
 	}
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->photo_missing;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 9072 "PhotoPage.c"
+#line 9088 "PhotoPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = pixbuf;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp27_ != NULL;
-#line 9078 "PhotoPage.c"
+#line 9094 "PhotoPage.c"
 	} else {
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = FALSE;
-#line 9082 "PhotoPage.c"
+#line 9098 "PhotoPage.c"
 	}
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp25_) {
-#line 9086 "PhotoPage.c"
+#line 9102 "PhotoPage.c"
 		GdkPixbuf* _tmp28_ = NULL;
 		Dimensions _tmp29_ = {0};
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = max_dim;
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
-#line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9097 "PhotoPage.c"
+#line 9113 "PhotoPage.c"
 	}
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9107 "PhotoPage.c"
+#line 9123 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9124 "PhotoPage.c"
+#line 9140 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_resize_finished");
-#line 1323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9140 "PhotoPage.c"
+#line 9156 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
+#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_viewport_resized");
-#line 1332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9153 "PhotoPage.c"
+#line 9169 "PhotoPage.c"
 }
 
 
@@ -9200,300 +9216,300 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	GtkToggleToolButton* _tmp58_ = NULL;
 	gint _tmp59_ = 0;
 	gint _tmp60_ = 0;
-#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple_photos = _tmp3_;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->prev_button;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = multiple_photos;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->next_button;
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = multiple_photos;
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (self);
-#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp8_;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp9_;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9237 "PhotoPage.c"
+#line 9253 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9243 "PhotoPage.c"
+#line 9259 "PhotoPage.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9247 "PhotoPage.c"
+#line 9263 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9251 "PhotoPage.c"
+#line 9267 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9260 "PhotoPage.c"
+#line 9276 "PhotoPage.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9264 "PhotoPage.c"
+#line 9280 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9268 "PhotoPage.c"
+#line 9284 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9277 "PhotoPage.c"
+#line 9293 "PhotoPage.c"
 	} else {
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9281 "PhotoPage.c"
+#line 9297 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = photo;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9291 "PhotoPage.c"
+#line 9307 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9297 "PhotoPage.c"
+#line 9313 "PhotoPage.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9301 "PhotoPage.c"
+#line 9317 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9305 "PhotoPage.c"
+#line 9321 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = scaling;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9317 "PhotoPage.c"
+#line 9333 "PhotoPage.c"
 	} else {
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9321 "PhotoPage.c"
+#line 9337 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_);
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = photo;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9331 "PhotoPage.c"
+#line 9347 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9337 "PhotoPage.c"
+#line 9353 "PhotoPage.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9341 "PhotoPage.c"
+#line 9357 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9345 "PhotoPage.c"
+#line 9361 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = photo;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = scaling;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9357 "PhotoPage.c"
+#line 9373 "PhotoPage.c"
 	} else {
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9361 "PhotoPage.c"
+#line 9377 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_);
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp38_ = photo;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9371 "PhotoPage.c"
+#line 9387 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9377 "PhotoPage.c"
+#line 9393 "PhotoPage.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9381 "PhotoPage.c"
+#line 9397 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9385 "PhotoPage.c"
+#line 9401 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = photo;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = scaling;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9397 "PhotoPage.c"
+#line 9413 "PhotoPage.c"
 	} else {
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9401 "PhotoPage.c"
+#line 9417 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_);
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = photo;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9411 "PhotoPage.c"
+#line 9427 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9417 "PhotoPage.c"
+#line 9433 "PhotoPage.c"
 	} else {
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9421 "PhotoPage.c"
+#line 9437 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9425 "PhotoPage.c"
+#line 9441 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = photo;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9434 "PhotoPage.c"
+#line 9450 "PhotoPage.c"
 	} else {
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9438 "PhotoPage.c"
+#line 9454 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = photo;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9448 "PhotoPage.c"
+#line 9464 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9454 "PhotoPage.c"
+#line 9470 "PhotoPage.c"
 	} else {
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9458 "PhotoPage.c"
+#line 9474 "PhotoPage.c"
 	}
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9462 "PhotoPage.c"
+#line 9478 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = photo;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = scaling;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9474 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
 	} else {
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9478 "PhotoPage.c"
+#line 9494 "PhotoPage.c"
 	}
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp59_ = selected_count;
-#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp60_ = count;
-#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9492 "PhotoPage.c"
+#line 9508 "PhotoPage.c"
 }
 
 
@@ -9506,67 +9522,67 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9511 "PhotoPage.c"
+#line 9527 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/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"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9517 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9521 "PhotoPage.c"
+#line 9537 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9525 "PhotoPage.c"
+#line 9541 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/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"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9531 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9535 "PhotoPage.c"
+#line 9551 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9539 "PhotoPage.c"
+#line 9555 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9545 "PhotoPage.c"
+#line 9561 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9549 "PhotoPage.c"
+#line 9565 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9555 "PhotoPage.c"
+#line 9571 "PhotoPage.c"
 	}
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9565 "PhotoPage.c"
+#line 9581 "PhotoPage.c"
 }
 
 
@@ -9576,25 +9592,25 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9583 "PhotoPage.c"
+#line 9599 "PhotoPage.c"
 	}
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9593 "PhotoPage.c"
+#line 9609 "PhotoPage.c"
 }
 
 
@@ -9604,25 +9620,25 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9611 "PhotoPage.c"
+#line 9627 "PhotoPage.c"
 	}
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9621 "PhotoPage.c"
+#line 9637 "PhotoPage.c"
 }
 
 
@@ -9634,53 +9650,53 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp2_ = NULL;
 	GdkEventKey* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_tool;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9639 "PhotoPage.c"
+#line 9655 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/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"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9645 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
 	} else {
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9649 "PhotoPage.c"
+#line 9665 "PhotoPage.c"
 	}
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9653 "PhotoPage.c"
+#line 9669 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/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"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9659 "PhotoPage.c"
+#line 9675 "PhotoPage.c"
 	} else {
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9663 "PhotoPage.c"
+#line 9679 "PhotoPage.c"
 	}
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9669 "PhotoPage.c"
+#line 9685 "PhotoPage.c"
 	}
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_);
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp6_;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9679 "PhotoPage.c"
+#line 9695 "PhotoPage.c"
 }
 
 
@@ -9694,9 +9710,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	Photo* _tmp14_ = NULL;
 	Dimensions _tmp15_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9695 "PhotoPage.c"
+#line 9711 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9707,148 +9723,148 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		Photo* _tmp6_ = NULL;
 		Orientation _tmp7_ = 0;
 		GdkPixbuf* _tmp8_ = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (self);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo_get_prefetched_copy (_tmp2_, &_inner_error_);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9720 "PhotoPage.c"
-			goto __catch248_g_error;
+#line 9736 "PhotoPage.c"
+			goto __catch249_g_error;
 		}
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_get_original_orientation (_tmp6_);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		original = _tmp8_;
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9739 "PhotoPage.c"
+#line 9755 "PhotoPage.c"
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9755 "PhotoPage.c"
+#line 9771 "PhotoPage.c"
 	}
-	__finally248:
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally249:
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/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 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9768 "PhotoPage.c"
+#line 9784 "PhotoPage.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->swapped = _tmp9_;
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->zoom_slider;
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange));
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ != 0.0) {
-#line 1406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9786 "PhotoPage.c"
+#line 9802 "PhotoPage.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = editing_host_page_get_photo (self);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo_get_master_dimensions (_tmp14_, &_tmp15_);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9802 "PhotoPage.c"
+#line 9818 "PhotoPage.c"
 }
 
 
 static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	GdkPixbuf* _tmp0_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->swapped;
-#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9814 "PhotoPage.c"
+#line 9830 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->swapped;
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp1_, &_tmp4_, NULL);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_update_cursor_for_zoom_context (self);
 #line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_host_page_update_cursor_for_zoom_context (self);
+#line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->swapped);
-#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9839 "PhotoPage.c"
+#line 9855 "PhotoPage.c"
 	}
 }
 
 
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9847 "PhotoPage.c"
+#line 9863 "PhotoPage.c"
 }
 
 
@@ -9869,37 +9885,37 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	EditingToolsEditingTool* _tmp28_ = NULL;
 	EditingToolsPhotoCanvas* _tmp29_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool));
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool));
+#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1432 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cancel_editing_pixbuf = _tmp1_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9898 "PhotoPage.c"
+#line 9914 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9913,192 +9929,192 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_.width = 0;
-#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp6_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = tool;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (self);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp12_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp14_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9936 "PhotoPage.c"
-			goto __catch249_g_error;
+#line 9952 "PhotoPage.c"
+			goto __catch250_g_error;
 		}
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		unscaled = _tmp15_;
-#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = unscaled;
-#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9951 "PhotoPage.c"
+#line 9967 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9957 "PhotoPage.c"
+#line 9973 "PhotoPage.c"
 		}
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9961 "PhotoPage.c"
+#line 9977 "PhotoPage.c"
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkToggleToolButton* _tmp20_ = NULL;
 		GtkToggleToolButton* _tmp21_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = err;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1448: %s", _tmp19_);
-#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_set_photo_missing (self, TRUE);
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1451: %s", _tmp19_);
 #line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_host_page_set_photo_missing (self, TRUE);
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = self->priv->current_editing_toggle;
-#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_vala_assert (_tmp20_ != NULL, "current_editing_toggle != null");
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = self->priv->current_editing_toggle;
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_toggle_tool_button_set_active (_tmp21_, FALSE);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9997 "PhotoPage.c"
+#line 10013 "PhotoPage.c"
 	}
-	__finally249:
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally250:
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/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 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10010 "PhotoPage.c"
+#line 10026 "PhotoPage.c"
 	}
-#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
-#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10016 "PhotoPage.c"
+#line 10032 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = unscaled;
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = max_dim;
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL);
-#line 10025 "PhotoPage.c"
+#line 10041 "PhotoPage.c"
 	}
-#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
-#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = tool;
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_);
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_tool = _tmp27_;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->current_tool;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = photo_canvas;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
 #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_place_tool_window (self);
+	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
 #line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_place_tool_window (self);
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10053 "PhotoPage.c"
+#line 10069 "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"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10060 "PhotoPage.c"
+#line 10076 "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"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10067 "PhotoPage.c"
+#line 10083 "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"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10074 "PhotoPage.c"
+#line 10090 "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"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10081 "PhotoPage.c"
+#line 10097 "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"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10088 "PhotoPage.c"
+#line 10104 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
-#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10097 "PhotoPage.c"
+#line 10113 "PhotoPage.c"
 }
 
 
@@ -10128,60 +10144,60 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp43_ = NULL;
 	gboolean _tmp46_ = FALSE;
 	Command* _tmp47_ = NULL;
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (new_max_dim != NULL);
-#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10141 "PhotoPage.c"
+#line 10157 "PhotoPage.c"
 	}
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _editing_tools_editing_tool_ref0 (_tmp1_);
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp2_;
-#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_tool = NULL;
 #line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_tool = NULL;
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool;
-#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (_tmp3_);
-#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp4_;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = tool_window;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10163 "PhotoPage.c"
+#line 10179 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = tool_window;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10172 "PhotoPage.c"
+#line 10188 "PhotoPage.c"
 	} else {
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10176 "PhotoPage.c"
+#line 10192 "PhotoPage.c"
 	}
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10180 "PhotoPage.c"
+#line 10196 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10199,219 +10215,219 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gint _tmp23_ = 0;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = tool_window;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_);
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_x = _tmp10_;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_y = _tmp11_;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->last_locations;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = tool;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_->name;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = g_strconcat (_tmp14_, "_x", NULL);
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = last_location_x;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_));
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp16_);
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = self->priv->last_locations;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = tool;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_->name;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strconcat (_tmp20_, "_y", NULL);
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = last_location_y;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		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"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10238 "PhotoPage.c"
+#line 10254 "PhotoPage.c"
 	}
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_deactivate (_tmp24_);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = tool;
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = tool;
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = tool;
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self);
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = tool;
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE);
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self);
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = tool;
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE);
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
-#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = NULL;
-#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_editing_toggle = NULL;
 #line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_editing_toggle = NULL;
+#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	replacement = NULL;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = new_pixbuf;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10288 "PhotoPage.c"
+#line 10304 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = new_pixbuf;
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (replacement);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10299 "PhotoPage.c"
+#line 10315 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10306 "PhotoPage.c"
+#line 10322 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
 			Dimensions _tmp42_ = {0};
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp39_ = self->priv->cancel_editing_pixbuf;
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp40_ = _g_object_ref0 (_tmp39_);
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (replacement);
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			replacement = _tmp40_;
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp41_ = replacement;
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			dimensions_for_pixbuf (_tmp41_, &_tmp42_);
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			*new_max_dim = _tmp42_;
-#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10327 "PhotoPage.c"
+#line 10343 "PhotoPage.c"
 		} else {
-#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10331 "PhotoPage.c"
+#line 10347 "PhotoPage.c"
 		}
 	}
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10338 "PhotoPage.c"
+#line 10354 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = replacement;
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = *new_max_dim;
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL);
-#line 10347 "PhotoPage.c"
+#line 10363 "PhotoPage.c"
 	}
-#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->cancel_editing_pixbuf = NULL;
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->cancel_editing_pixbuf = NULL;
+#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = needs_improvement;
-#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 1526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = TRUE;
-#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref);
-#line 10361 "PhotoPage.c"
+#line 10377 "PhotoPage.c"
 	}
-#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
-#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10367 "PhotoPage.c"
+#line 10383 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = _tmp48_;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = command;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp49_, _tmp50_);
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10381 "PhotoPage.c"
+#line 10397 "PhotoPage.c"
 	}
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10389 "PhotoPage.c"
+#line 10405 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10401 "PhotoPage.c"
+#line 10417 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) {
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10410 "PhotoPage.c"
+#line 10426 "PhotoPage.c"
 }
 
 
@@ -10435,141 +10451,141 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	EditingToolsEditingTool* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
 	gint _tmp24_ = 0;
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10444 "PhotoPage.c"
+#line 10460 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10451 "PhotoPage.c"
+#line 10467 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = event;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10460 "PhotoPage.c"
+#line 10476 "PhotoPage.c"
 		} else {
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10464 "PhotoPage.c"
+#line 10480 "PhotoPage.c"
 		}
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10470 "PhotoPage.c"
+#line 10486 "PhotoPage.c"
 	}
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_->x;
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = (gint) _tmp7_;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = event;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_->y;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = (gint) _tmp9_;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->current_tool;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10488 "PhotoPage.c"
+#line 10504 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->zoom_slider;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10497 "PhotoPage.c"
+#line 10513 "PhotoPage.c"
 	} else {
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10501 "PhotoPage.c"
+#line 10517 "PhotoPage.c"
 	}
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10505 "PhotoPage.c"
+#line 10521 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
 		gdouble _tmp17_ = 0.0;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = event;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_->x;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.x = (gint) _tmp15_;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = event;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_->y;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.y = (gint) _tmp17_;
-#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = TRUE;
-#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10530 "PhotoPage.c"
+#line 10546 "PhotoPage.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
-#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp18_ == NULL) {
-#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10540 "PhotoPage.c"
+#line 10556 "PhotoPage.c"
 	}
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_);
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10554 "PhotoPage.c"
+#line 10570 "PhotoPage.c"
 	}
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = x;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = y;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10568 "PhotoPage.c"
+#line 10584 "PhotoPage.c"
 }
 
 
@@ -10587,15 +10603,15 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	EditingToolsEditingToolWindow* _tmp28_ = NULL;
 	EditingToolsEditingToolWindow* _tmp29_ = NULL;
 	gboolean _tmp30_ = FALSE;
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->is_pan_in_progress;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10594 "PhotoPage.c"
+#line 10610 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10620,125 +10636,125 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		ZoomBuffer* _tmp18_ = NULL;
 		ZoomBuffer* _tmp19_ = NULL;
 		ZoomState _tmp20_ = {0};
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp1_, &_tmp2_);
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp2_;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = event;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->zoom_pan_start_point;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_.x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp4_) - _tmp6_;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_y = ((gint) _tmp8_) - _tmp10_;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = viewport_center.x;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = delta_x;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp11_ - _tmp12_;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = viewport_center.y;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = delta_y;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.y = _tmp13_ - _tmp14_;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = viewport_center;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_);
-#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = zoom_state;
-#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = zoom_state;
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_);
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = FALSE;
-#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10681 "PhotoPage.c"
+#line 10697 "PhotoPage.c"
 	}
-#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
-#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ == NULL) {
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10691 "PhotoPage.c"
+#line 10707 "PhotoPage.c"
 	}
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = event;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_->x;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = event;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_->y;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->current_tool;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = _tmp28_;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_ != NULL;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10717 "PhotoPage.c"
+#line 10733 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->current_tool;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_);
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10731 "PhotoPage.c"
+#line 10747 "PhotoPage.c"
 	}
-#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10737 "PhotoPage.c"
+#line 10753 "PhotoPage.c"
 }
 
 
@@ -10747,28 +10763,28 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10758 "PhotoPage.c"
+#line 10774 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10767 "PhotoPage.c"
+#line 10783 "PhotoPage.c"
 }
 
 
@@ -10788,107 +10804,107 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	ViewCollection* _tmp12_ = NULL;
 	ViewCollection* _tmp13_ = NULL;
 	gint _tmp14_ = 0;
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10807 "PhotoPage.c"
+#line 10823 "PhotoPage.c"
 	}
-#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (self);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo_has_transformations (_tmp6_);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref);
-#line 10825 "PhotoPage.c"
+#line 10841 "PhotoPage.c"
 	}
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_selected_count (_tmp10_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10845 "PhotoPage.c"
+#line 10861 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) {
-#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10854 "PhotoPage.c"
+#line 10870 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10867 "PhotoPage.c"
+#line 10883 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->master_cache;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10881 "PhotoPage.c"
+#line 10897 "PhotoPage.c"
 	}
-#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10887 "PhotoPage.c"
+#line 10903 "PhotoPage.c"
 }
 
 
@@ -10907,82 +10923,82 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	gint _tmp8_ = 0;
 	Dimensions _tmp9_ = {0};
 	gint _tmp10_ = 0;
-#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
+#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.width = 0;
-#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim = _tmp0_;
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/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 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_zoomed_width (&_tmp1_);
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.width = _tmp2_;
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = zoom_state_get_zoomed_height (&_tmp3_);
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.height = _tmp4_;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	canvas_dim = _tmp5_;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = canvas_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = content_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10938 "PhotoPage.c"
+#line 10954 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
 		gint _tmp14_ = 0;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = canvas_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_.height;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = content_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.height;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10953 "PhotoPage.c"
+#line 10969 "PhotoPage.c"
 	} else {
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10957 "PhotoPage.c"
+#line 10973 "PhotoPage.c"
 	}
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10963 "PhotoPage.c"
+#line 10979 "PhotoPage.c"
 }
 
 
 static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_is_panning_possible (self);
-#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 10977 "PhotoPage.c"
+#line 10993 "PhotoPage.c"
 	} else {
-#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 10981 "PhotoPage.c"
+#line 10997 "PhotoPage.c"
 	}
 }
 
@@ -10997,47 +11013,47 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp26_ = 0;
 	GdkModifierType _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11004 "PhotoPage.c"
+#line 11020 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
 		GdkEventMotion* _tmp5_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = x;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = y;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = mask;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
+#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_event_request_motions (_tmp5_);
-#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11028 "PhotoPage.c"
+#line 11044 "PhotoPage.c"
 	}
-#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->is_pan_in_progress;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11036 "PhotoPage.c"
+#line 11052 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11059,75 +11075,75 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		ZoomState _tmp21_ = {0};
 		GdkPoint _tmp22_ = {0};
 		ZoomState _tmp23_ = {0};
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->x;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.x;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp8_) - _tmp10_;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = event;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_->y;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->zoom_pan_start_point;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.y;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_y = ((gint) _tmp12_) - _tmp14_;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp15_, &_tmp16_);
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp16_;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = viewport_center.x;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = delta_x;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp17_ - _tmp18_;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = viewport_center.y;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = delta_y;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.y = _tmp19_ - _tmp20_;
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_);
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = viewport_center;
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_);
-#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = zoom_state;
-#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11110 "PhotoPage.c"
+#line 11126 "PhotoPage.c"
 	}
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = x;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = y;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = mask;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_);
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp28_;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11126 "PhotoPage.c"
+#line 11142 "PhotoPage.c"
 }
 
 
@@ -11136,83 +11152,83 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11141 "PhotoPage.c"
+#line 11157 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_);
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11152 "PhotoPage.c"
+#line 11168 "PhotoPage.c"
 	}
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11160 "PhotoPage.c"
+#line 11176 "PhotoPage.c"
 }
 
 
 static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11172 "PhotoPage.c"
+#line 11188 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_window = _tmp2_;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = tool_window;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11188 "PhotoPage.c"
+#line 11204 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = tool_window;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11197 "PhotoPage.c"
+#line 11213 "PhotoPage.c"
 		} else {
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11201 "PhotoPage.c"
+#line 11217 "PhotoPage.c"
 		}
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11207 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
 		}
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11211 "PhotoPage.c"
+#line 11227 "PhotoPage.c"
 	}
 }
 
@@ -11220,17 +11236,17 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 11229 "PhotoPage.c"
+#line 11245 "PhotoPage.c"
 }
 
 
@@ -11238,19 +11254,19 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	EditingHostPage * self;
 	GeeHashMap* _tmp0_ = NULL;
 	GdkRectangle _tmp1_ = {0};
-#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->last_locations;
-#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = *rect;
-#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_);
-#line 11249 "PhotoPage.c"
+#line 11265 "PhotoPage.c"
 }
 
 
@@ -11265,153 +11281,153 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11288 "PhotoPage.c"
+#line 11304 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
 	ZoomState _tmp14_ = {0};
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_zoom_state = _tmp0_;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&current_zoom_state, &_tmp1_);
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp1_;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11319 "PhotoPage.c"
+#line 11335 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
-#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp8_ = viewport_center.x;
-#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11329 "PhotoPage.c"
+#line 11345 "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"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11335 "PhotoPage.c"
+#line 11351 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = viewport_center.x;
-#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11345 "PhotoPage.c"
+#line 11361 "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"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11351 "PhotoPage.c"
+#line 11367 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = viewport_center.y;
-#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11361 "PhotoPage.c"
+#line 11377 "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"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11367 "PhotoPage.c"
+#line 11383 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
-#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = viewport_center.y;
-#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11377 "PhotoPage.c"
+#line 11393 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11383 "PhotoPage.c"
+#line 11399 "PhotoPage.c"
 			default:
 			{
-#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
-#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11390 "PhotoPage.c"
+#line 11406 "PhotoPage.c"
 			}
 		}
 	}
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = current_zoom_state;
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = viewport_center;
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_);
-#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_zoom_state;
-#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_);
-#line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11410 "PhotoPage.c"
+#line 11426 "PhotoPage.c"
 }
 
 
@@ -11428,212 +11444,212 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	GQuark _tmp14_ = 0U;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label0 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label1 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label2 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label3 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label4 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label5 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label6 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11443 "PhotoPage.c"
+#line 11459 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11454 "PhotoPage.c"
+#line 11470 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = event;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_);
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11470 "PhotoPage.c"
+#line 11486 "PhotoPage.c"
 		}
 	}
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11477 "PhotoPage.c"
+#line 11493 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_);
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11490 "PhotoPage.c"
+#line 11506 "PhotoPage.c"
 		}
 	}
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_);
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11503 "PhotoPage.c"
+#line 11519 "PhotoPage.c"
 	}
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = event;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_->keyval;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gdk_keyval_name (_tmp10_);
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_);
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11521 "PhotoPage.c"
+#line 11537 "PhotoPage.c"
 			default:
 			{
-#line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11526 "PhotoPage.c"
+#line 11542 "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"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11532 "PhotoPage.c"
+#line 11548 "PhotoPage.c"
 			default:
 			{
-#line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1785 "/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"
+#line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11539 "PhotoPage.c"
+#line 11555 "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"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11545 "PhotoPage.c"
+#line 11561 "PhotoPage.c"
 			default:
 			{
-#line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1792 "/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"
+#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11552 "PhotoPage.c"
+#line 11568 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11558 "PhotoPage.c"
+#line 11574 "PhotoPage.c"
 			default:
 			{
-#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11565 "PhotoPage.c"
+#line 11581 "PhotoPage.c"
 			}
 		}
 	}
-#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = handled;
-#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11577 "PhotoPage.c"
+#line 11593 "PhotoPage.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11581 "PhotoPage.c"
+#line 11597 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = event;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11590 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
 	} else {
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11594 "PhotoPage.c"
+#line 11610 "PhotoPage.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11600 "PhotoPage.c"
+#line 11616 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
 	EditingHostPage * self;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (dim != NULL);
-#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11617 "PhotoPage.c"
+#line 11633 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_->canvas;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = default_ctx;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = *dim;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11632 "PhotoPage.c"
+#line 11648 "PhotoPage.c"
 	}
 }
 
@@ -11642,130 +11658,130 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	EditingToolsEditingTool* _tmp1_ = NULL;
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11651 "PhotoPage.c"
+#line 11667 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11657 "PhotoPage.c"
+#line 11673 "PhotoPage.c"
 	} else {
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11661 "PhotoPage.c"
+#line 11677 "PhotoPage.c"
 	}
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11665 "PhotoPage.c"
+#line 11681 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
 		GdkPixbuf* _tmp6_ = NULL;
 		GdkRectangle _tmp7_ = {0};
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->canvas;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = *old_dim;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/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), &_tmp7_);
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_);
-#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11687 "PhotoPage.c"
+#line 11703 "PhotoPage.c"
 	}
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11698 "PhotoPage.c"
+#line 11714 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
-#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11707 "PhotoPage.c"
+#line 11723 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11717 "PhotoPage.c"
+#line 11733 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) {
-#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11726 "PhotoPage.c"
+#line 11742 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11736 "PhotoPage.c"
+#line 11752 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) {
-#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11745 "PhotoPage.c"
+#line 11761 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11755 "PhotoPage.c"
+#line 11771 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
-#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11764 "PhotoPage.c"
+#line 11780 "PhotoPage.c"
 }
 
 
@@ -11789,48 +11805,48 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	GdkPixbuf* _tmp74_ = NULL;
 	GdkPixbuf* _tmp98_ = NULL;
 	GdkPixbuf* _tmp99_ = NULL;
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11798 "PhotoPage.c"
+#line 11814 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = ctx;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
-#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11809 "PhotoPage.c"
+#line 11825 "PhotoPage.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11815 "PhotoPage.c"
+#line 11831 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11821 "PhotoPage.c"
+#line 11837 "PhotoPage.c"
 	} else {
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11825 "PhotoPage.c"
+#line 11841 "PhotoPage.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11829 "PhotoPage.c"
+#line 11845 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11848,91 +11864,91 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = ctx;
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		set_source_color_from_string (_tmp6_, "#000");
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = ctx;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_.width;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_.height;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = ctx;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp12_);
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = ctx;
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_paint (_tmp13_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _ ("Photo source file missing: %s");
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strdup_printf (_tmp14_, _tmp20_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_draw_message (self, _tmp22_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp20_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11901 "PhotoPage.c"
+#line 11917 "PhotoPage.c"
 	}
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = *ctx_dim;
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = zoom_state_is_default (&_tmp25_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11917 "PhotoPage.c"
+#line 11933 "PhotoPage.c"
 	}
-#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_);
-#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaled_rect = _tmp27_;
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp28_;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = trinket;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 11931 "PhotoPage.c"
+#line 11947 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -11958,75 +11974,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp50_ = 0;
 		gint _tmp51_ = 0;
 		cairo_t* _tmp52_ = NULL;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = scaled_rect;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_.x;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = scaled_rect;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_.y;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = scaled_rect;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = _tmp34_.height;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = trinket;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = gdk_pixbuf_get_height (_tmp36_);
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = ctx;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = trinket;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = x;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = y;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp43_ = ctx;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = x;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = y;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp46_ = trinket;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = trinket;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp50_;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_);
-#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = ctx;
-#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12013 "PhotoPage.c"
+#line 12029 "PhotoPage.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp53_;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp54_ = trinket;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12025 "PhotoPage.c"
+#line 12041 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12047,65 +12063,65 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp70_ = 0;
 		gint _tmp71_ = 0;
 		cairo_t* _tmp72_ = NULL;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = scaled_rect;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = _tmp55_.x;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = scaled_rect;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_.y;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = ctx;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = trinket;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp61_ = x;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp62_ = y;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp63_ = ctx;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp64_ = x;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp65_ = y;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp66_ = trinket;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp67_ = gdk_pixbuf_get_width (_tmp66_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp68_ = _tmp67_;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp69_ = trinket;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp70_ = gdk_pixbuf_get_height (_tmp69_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp71_ = _tmp70_;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_);
-#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp72_ = ctx;
-#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12092 "PhotoPage.c"
+#line 12108 "PhotoPage.c"
 	}
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp73_;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp74_ = trinket;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12104 "PhotoPage.c"
+#line 12120 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12131,75 +12147,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp95_ = 0;
 		gint _tmp96_ = 0;
 		cairo_t* _tmp97_ = NULL;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp75_ = scaled_rect;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp76_ = _tmp75_.x;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp77_ = scaled_rect;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp78_ = _tmp77_.width;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp79_ = trinket;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp80_ = gdk_pixbuf_get_width (_tmp79_);
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp81_ = _tmp80_;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp82_ = scaled_rect;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp83_ = _tmp82_.y;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp84_ = ctx;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp85_ = trinket;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp86_ = x;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp87_ = y;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp88_ = ctx;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp89_ = x;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp90_ = y;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp91_ = trinket;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp92_ = gdk_pixbuf_get_width (_tmp91_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp93_ = _tmp92_;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp94_ = trinket;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp95_ = gdk_pixbuf_get_height (_tmp94_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp96_ = _tmp95_;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_);
-#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp97_ = ctx;
-#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12186 "PhotoPage.c"
+#line 12202 "PhotoPage.c"
 	}
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp98_;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp99_ = trinket;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12198 "PhotoPage.c"
+#line 12214 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12230,94 +12246,94 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp125_ = 0;
 		gint _tmp126_ = 0;
 		cairo_t* _tmp127_ = NULL;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp100_ = scaled_rect;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp101_ = _tmp100_.x;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp102_ = scaled_rect;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp103_ = _tmp102_.width;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp104_ = trinket;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp105_ = gdk_pixbuf_get_width (_tmp104_);
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp106_ = _tmp105_;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp107_ = scaled_rect;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp108_ = _tmp107_.y;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp109_ = scaled_rect;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp110_ = _tmp109_.height;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp111_ = trinket;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp112_ = gdk_pixbuf_get_height (_tmp111_);
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp113_ = _tmp112_;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp114_ = ctx;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp115_ = trinket;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp116_ = x;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp117_ = y;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp118_ = ctx;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp119_ = x;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp120_ = y;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp121_ = trinket;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp122_ = gdk_pixbuf_get_width (_tmp121_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp123_ = _tmp122_;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp124_ = trinket;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp125_ = gdk_pixbuf_get_height (_tmp124_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp126_ = _tmp125_;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_);
-#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp127_ = ctx;
-#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12295 "PhotoPage.c"
+#line 12311 "PhotoPage.c"
 	}
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12299 "PhotoPage.c"
+#line 12315 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12316 "PhotoPage.c"
+#line 12332 "PhotoPage.c"
 }
 
 
@@ -12335,93 +12351,93 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	RotateSingleCommand* _tmp11_ = NULL;
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (name != NULL);
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (description != NULL);
-#line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12352 "PhotoPage.c"
+#line 12368 "PhotoPage.c"
 	}
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = rotation;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = name;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = description;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp8_;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12384 "PhotoPage.c"
+#line 12400 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
-#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12393 "PhotoPage.c"
+#line 12409 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
-#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12402 "PhotoPage.c"
+#line 12418 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
-#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12411 "PhotoPage.c"
+#line 12427 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_vertically (EditingHostPage* self) {
-#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12420 "PhotoPage.c"
+#line 12436 "PhotoPage.c"
 }
 
 
@@ -12441,41 +12457,41 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	RevertSingleCommand* _tmp23_ = NULL;
-#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12448 "PhotoPage.c"
+#line 12464 "PhotoPage.c"
 	}
-#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12460 "PhotoPage.c"
+#line 12476 "PhotoPage.c"
 	}
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo_has_editable (_tmp4_);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12474 "PhotoPage.c"
+#line 12490 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12486,73 +12502,73 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		gboolean _tmp14_ = FALSE;
 		Photo* _tmp15_ = NULL;
 		Photo* _tmp16_ = NULL;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = view_collection_get_sources (_tmp10_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = !_tmp13_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp14_) {
-#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12511 "PhotoPage.c"
+#line 12527 "PhotoPage.c"
 		}
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_revert_to_master (_tmp16_, TRUE);
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12521 "PhotoPage.c"
+#line 12537 "PhotoPage.c"
 	}
-#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, FALSE);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = editing_host_page_get_photo (self);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = revert_single_command_new (_tmp18_);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp18_);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp20_;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = command;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12551 "PhotoPage.c"
+#line 12567 "PhotoPage.c"
 }
 
 
@@ -12578,104 +12594,104 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditTitleCommand* _tmp18_ = NULL;
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12589 "PhotoPage.c"
+#line 12605 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12600 "PhotoPage.c"
+#line 12616 "PhotoPage.c"
 		}
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12606 "PhotoPage.c"
+#line 12622 "PhotoPage.c"
 	} else {
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12612 "PhotoPage.c"
+#line 12628 "PhotoPage.c"
 	}
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_title_dialog_new (_tmp7_);
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_title_dialog = _tmp9_;
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_title_dialog;
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_title_dialog_execute (_tmp10_);
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_title = _tmp11_;
-#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_title;
-#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_title);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12646 "PhotoPage.c"
+#line 12662 "PhotoPage.c"
 	}
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_title;
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_title_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_title);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12674 "PhotoPage.c"
+#line 12690 "PhotoPage.c"
 }
 
 
@@ -12701,104 +12717,104 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditCommentCommand* _tmp18_ = NULL;
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12712 "PhotoPage.c"
+#line 12728 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12723 "PhotoPage.c"
+#line 12739 "PhotoPage.c"
 		}
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12729 "PhotoPage.c"
+#line 12745 "PhotoPage.c"
 	} else {
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12735 "PhotoPage.c"
+#line 12751 "PhotoPage.c"
 	}
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_comment_dialog_new (_tmp7_, FALSE);
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_comment_dialog = _tmp9_;
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_comment_dialog;
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_comment_dialog_execute (_tmp10_);
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_comment = _tmp11_;
-#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_comment;
-#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_comment);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12769 "PhotoPage.c"
+#line 12785 "PhotoPage.c"
 	}
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_comment;
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_comment_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_comment);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12797 "PhotoPage.c"
+#line 12813 "PhotoPage.c"
 }
 
 
@@ -12817,43 +12833,43 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12824 "PhotoPage.c"
+#line 12840 "PhotoPage.c"
 	}
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp4_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = dialog;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	time_shift = _tmp6_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	keep_relativity = _tmp7_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	modify_originals = _tmp8_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12852 "PhotoPage.c"
+#line 12868 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12868,63 +12884,63 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		CommandManager* _tmp20_ = NULL;
 		CommandManager* _tmp21_ = NULL;
 		AdjustDateTimePhotoCommand* _tmp22_ = NULL;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = view_collection_get_selected (_tmp11_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp12_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (self);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = time_shift;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = modify_originals;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp19_;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = command;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp21_);
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12907 "PhotoPage.c"
+#line 12923 "PhotoPage.c"
 	}
-#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12911 "PhotoPage.c"
+#line 12927 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_set_background (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12923 "PhotoPage.c"
+#line 12939 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -12933,23 +12949,23 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = set_background_photo_dialog_new ();
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp1_);
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dialog = _tmp1_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = dialog;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop = _tmp3_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		screensaver = _tmp4_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12948 "PhotoPage.c"
+#line 12964 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -12958,47 +12974,47 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 			gboolean _tmp11_ = FALSE;
 			AppWindow* _tmp12_ = NULL;
 			AppWindow* _tmp13_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = app_window_get_instance ();
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp7_);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = editing_host_page_get_photo (self);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = _tmp8_;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = desktop;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = screensaver;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp9_);
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = app_window_get_instance ();
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = _tmp12_;
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 12985 "PhotoPage.c"
+#line 13001 "PhotoPage.c"
 		}
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 12989 "PhotoPage.c"
+#line 13005 "PhotoPage.c"
 	}
 }
 
 
 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"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 12997 "PhotoPage.c"
+#line 13013 "PhotoPage.c"
 }
 
 
@@ -13014,47 +13030,47 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp6_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_COUNTERCLOCKWISE);
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CCW_LABEL);
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self);
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0);
-#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->current_tool;
-#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ == NULL) {
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13043 "PhotoPage.c"
+#line 13059 "PhotoPage.c"
 	}
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13053 "PhotoPage.c"
+#line 13069 "PhotoPage.c"
 }
 
 
@@ -13072,75 +13088,75 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp8_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_CLOCKWISE);
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CW_LABEL);
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self);
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = self->priv->current_tool;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13099 "PhotoPage.c"
+#line 13115 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/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"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13105 "PhotoPage.c"
+#line 13121 "PhotoPage.c"
 	} else {
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13109 "PhotoPage.c"
+#line 13125 "PhotoPage.c"
 	}
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13113 "PhotoPage.c"
+#line 13129 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/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"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13119 "PhotoPage.c"
+#line 13135 "PhotoPage.c"
 	} else {
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13123 "PhotoPage.c"
+#line 13139 "PhotoPage.c"
 	}
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13129 "PhotoPage.c"
+#line 13145 "PhotoPage.c"
 	}
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_);
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13139 "PhotoPage.c"
+#line 13155 "PhotoPage.c"
 }
 
 
@@ -13163,92 +13179,92 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	EditingToolsEditingTool* _tmp15_ = NULL;
 	EditingToolsEditingTool* _tmp16_ = NULL;
 	EditingToolsEditingTool* _tmp17_ = NULL;
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13174 "PhotoPage.c"
+#line 13190 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->current_editing_toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13183 "PhotoPage.c"
+#line 13199 "PhotoPage.c"
 	} else {
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13187 "PhotoPage.c"
+#line 13203 "PhotoPage.c"
 	}
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
-#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp6_, 0, 0);
-#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE);
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = deactivating_only;
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13203 "PhotoPage.c"
+#line 13219 "PhotoPage.c"
 	}
-#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = toggle;
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_editing_toggle = _tmp9_;
 #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_editing_toggle = _tmp9_;
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = factory;
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_ ();
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp11_;
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = tool;
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0);
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = tool;
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = tool;
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0);
-#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = tool;
-#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0);
-#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = tool;
-#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
-#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = tool;
-#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_activate_tool (self, _tmp17_);
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13247 "PhotoPage.c"
+#line 13263 "PhotoPage.c"
 }
 
 
@@ -13256,21 +13272,21 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13269 "PhotoPage.c"
+#line 13285 "PhotoPage.c"
 }
 
 
@@ -13278,21 +13294,21 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13291 "PhotoPage.c"
+#line 13307 "PhotoPage.c"
 }
 
 
@@ -13301,55 +13317,55 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (new_max_dim != NULL);
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = command;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_pixbuf;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = *new_max_dim;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = needs_improvement;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13318 "PhotoPage.c"
+#line 13334 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13334 "PhotoPage.c"
+#line 13350 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13348 "PhotoPage.c"
+#line 13364 "PhotoPage.c"
 }
 
 
@@ -13357,17 +13373,17 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->crop_button;
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13366 "PhotoPage.c"
+#line 13382 "PhotoPage.c"
 }
 
 
@@ -13375,17 +13391,17 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->straighten_button;
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13384 "PhotoPage.c"
+#line 13400 "PhotoPage.c"
 }
 
 
@@ -13393,17 +13409,17 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->redeye_button;
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13402 "PhotoPage.c"
+#line 13418 "PhotoPage.c"
 }
 
 
@@ -13411,118 +13427,118 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->adjust_button;
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13420 "PhotoPage.c"
+#line 13436 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_straighten_tool_factory ();
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13429 "PhotoPage.c"
+#line 13445 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory);
-#line 13441 "PhotoPage.c"
+#line 13457 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_crop_tool_factory ();
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13450 "PhotoPage.c"
+#line 13466 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory);
-#line 13462 "PhotoPage.c"
+#line 13478 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_redeye_tool_factory ();
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13471 "PhotoPage.c"
+#line 13487 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory);
-#line 13483 "PhotoPage.c"
+#line 13499 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_adjust_tool_factory ();
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13492 "PhotoPage.c"
+#line 13508 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory);
-#line 13504 "PhotoPage.c"
+#line 13520 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13521 "PhotoPage.c"
+#line 13537 "PhotoPage.c"
 }
 
 
@@ -13541,79 +13557,79 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	CommandManager* _tmp11_ = NULL;
 	CommandManager* _tmp12_ = NULL;
 	EnhanceSingleCommand* _tmp13_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13546 "PhotoPage.c"
+#line 13562 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
-#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
-#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13554 "PhotoPage.c"
+#line 13570 "PhotoPage.c"
 	}
-#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13562 "PhotoPage.c"
+#line 13578 "PhotoPage.c"
 	}
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL);
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	adjust_tool = _tmp4_;
-#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = adjust_tool;
-#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13574 "PhotoPage.c"
+#line 13590 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
-#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
-#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_adjust_tool_enhance (_tmp6_);
-#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13584 "PhotoPage.c"
+#line 13600 "PhotoPage.c"
 	}
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = enhance_single_command_new (_tmp8_);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp10_;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = command;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13612 "PhotoPage.c"
+#line 13628 "PhotoPage.c"
 }
 
 
@@ -13623,33 +13639,33 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	Photo* _tmp2_ = NULL;
 	PixelTransformationBundle* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13630 "PhotoPage.c"
+#line 13646 "PhotoPage.c"
 	}
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_color_adjustments (_tmp2_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp4_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13648 "PhotoPage.c"
+#line 13664 "PhotoPage.c"
 }
 
 
@@ -13667,64 +13683,64 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	AdjustColorsSingleCommand* _tmp11_ = NULL;
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	copied_adjustments = _tmp0_;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13678 "PhotoPage.c"
+#line 13694 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13685 "PhotoPage.c"
+#line 13701 "PhotoPage.c"
 	}
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13693 "PhotoPage.c"
+#line 13709 "PhotoPage.c"
 	}
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = copied_adjustments;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp8_;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13723 "PhotoPage.c"
+#line 13739 "PhotoPage.c"
 }
 
 
@@ -13735,458 +13751,471 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	EditingToolsEditingToolWindow* _tmp2_ = NULL;
 	EditingToolsEditingToolWindow* _tmp3_ = NULL;
 	EditingToolsEditingToolWindow* _tmp4_ = NULL;
-	EditingToolsEditingToolWindow* _tmp5_ = NULL;
+	AppWindow* _tmp5_ = NULL;
+	AppWindow* _tmp6_ = NULL;
+	EditingToolsEditingToolWindow* _tmp7_ = NULL;
+	EditingToolsEditingToolWindow* _tmp8_ = NULL;
 	GtkAllocation tool_alloc = {0};
-	EditingToolsEditingToolWindow* _tmp6_ = NULL;
-	GtkAllocation _tmp7_ = {0};
+	EditingToolsEditingToolWindow* _tmp9_ = NULL;
+	GtkAllocation _tmp10_ = {0};
 	gint x = 0;
 	gint y = 0;
-	GeeHashMap* _tmp8_ = NULL;
-	EditingToolsEditingTool* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	GeeHashMap* _tmp11_ = NULL;
+	EditingToolsEditingTool* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
+	gboolean _tmp17_ = FALSE;
 	GdkScreen* screen = NULL;
-	GtkWindow* _tmp84_ = NULL;
-	GtkWindow* _tmp85_ = NULL;
-	GdkScreen* _tmp86_ = NULL;
-	GdkScreen* _tmp87_ = NULL;
-	GdkScreen* _tmp88_ = NULL;
-	gint _tmp89_ = 0;
+	GtkWindow* _tmp87_ = NULL;
+	GtkWindow* _tmp88_ = NULL;
+	GdkScreen* _tmp89_ = NULL;
 	GdkScreen* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	GtkAllocation _tmp92_ = {0};
-	gint _tmp93_ = 0;
+	GdkScreen* _tmp91_ = NULL;
+	gint _tmp92_ = 0;
+	GdkScreen* _tmp93_ = NULL;
 	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	GdkScreen* _tmp96_ = NULL;
+	GtkAllocation _tmp95_ = {0};
+	gint _tmp96_ = 0;
 	gint _tmp97_ = 0;
-	GtkAllocation _tmp98_ = {0};
-	gint _tmp99_ = 0;
+	gint _tmp98_ = 0;
+	GdkScreen* _tmp99_ = NULL;
 	gint _tmp100_ = 0;
-	EditingToolsEditingToolWindow* _tmp101_ = NULL;
+	GtkAllocation _tmp101_ = {0};
 	gint _tmp102_ = 0;
 	gint _tmp103_ = 0;
 	EditingToolsEditingToolWindow* _tmp104_ = NULL;
-	EditingToolsEditingToolWindow* _tmp105_ = NULL;
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gint _tmp105_ = 0;
+	gint _tmp106_ = 0;
+	EditingToolsEditingToolWindow* _tmp107_ = NULL;
+	EditingToolsEditingToolWindow* _tmp108_ = NULL;
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13778 "PhotoPage.c"
+#line 13797 "PhotoPage.c"
 	}
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp2_;
-#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool_window;
-#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13794 "PhotoPage.c"
+#line 13813 "PhotoPage.c"
 	}
-#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
-#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = tool_window;
-#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = tool_window;
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = app_window_get_instance ();
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = _tmp5_;
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow));
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp6_);
 #line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), &_tmp7_);
+	_tmp7_ = tool_window;
 #line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	tool_alloc = _tmp7_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = self->priv->last_locations;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = self->priv->current_tool;
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 2188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = tool_window;
+#line 2188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_->name;
+	_tmp9_ = tool_window;
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = g_strconcat (_tmp10_, "_x", NULL);
+	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), &_tmp10_);
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp12_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_) {
-#line 13828 "PhotoPage.c"
-		GeeHashMap* _tmp15_ = NULL;
-		EditingToolsEditingTool* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gpointer _tmp20_ = NULL;
-		GeeHashMap* _tmp21_ = NULL;
-		EditingToolsEditingTool* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gpointer _tmp26_ = NULL;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = self->priv->last_locations;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = self->priv->current_tool;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _tmp16_->name;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = g_strconcat (_tmp17_, "_x", NULL);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = (gint) ((gintptr) _tmp20_);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp19_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = self->priv->last_locations;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = self->priv->current_tool;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = _tmp22_->name;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = g_strconcat (_tmp23_, "_y", NULL);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = _tmp24_;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = (gint) ((gintptr) _tmp26_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp25_);
-#line 13873 "PhotoPage.c"
-	} else {
-		GtkWindow* _tmp27_ = NULL;
-		GtkWindow* _tmp28_ = NULL;
-		AppWindow* _tmp29_ = NULL;
-		AppWindow* _tmp30_ = NULL;
-		gboolean _tmp31_ = FALSE;
+	tool_alloc = _tmp10_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp11_ = self->priv->last_locations;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12_ = self->priv->current_tool;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp13_ = _tmp12_->name;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp14_ = g_strconcat (_tmp13_, "_x", NULL);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp15_ = _tmp14_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = _tmp16_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_free0 (_tmp15_);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	if (_tmp17_) {
+#line 13857 "PhotoPage.c"
+		GeeHashMap* _tmp18_ = NULL;
+		EditingToolsEditingTool* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		gchar* _tmp21_ = NULL;
+		gchar* _tmp22_ = NULL;
+		gpointer _tmp23_ = NULL;
+		GeeHashMap* _tmp24_ = NULL;
+		EditingToolsEditingTool* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		gchar* _tmp27_ = NULL;
+		gchar* _tmp28_ = NULL;
+		gpointer _tmp29_ = NULL;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp18_ = self->priv->last_locations;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = _tmp27_;
+		_tmp19_ = self->priv->current_tool;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = app_window_get_instance ();
+		_tmp20_ = _tmp19_->name;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = _tmp29_;
+		_tmp21_ = g_strconcat (_tmp20_, "_x", NULL);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp28_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow);
+		_tmp22_ = _tmp21_;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp30_);
+		_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp28_);
+		x = (gint) ((gintptr) _tmp23_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp31_) {
-#line 13896 "PhotoPage.c"
+		_g_free0 (_tmp22_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp24_ = self->priv->last_locations;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp25_ = self->priv->current_tool;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp26_ = _tmp25_->name;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp27_ = g_strconcat (_tmp26_, "_y", NULL);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp28_ = _tmp27_;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		y = (gint) ((gintptr) _tmp29_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_free0 (_tmp28_);
+#line 13902 "PhotoPage.c"
+	} else {
+		GtkWindow* _tmp30_ = NULL;
+		GtkWindow* _tmp31_ = NULL;
+		AppWindow* _tmp32_ = NULL;
+		AppWindow* _tmp33_ = NULL;
+		gboolean _tmp34_ = FALSE;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp31_ = _tmp30_;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp32_ = app_window_get_instance ();
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp33_ = _tmp32_;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp34_ = _tmp31_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp33_);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp31_);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		if (_tmp34_) {
+#line 13925 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
-			GtkWindow* _tmp32_ = NULL;
-			GtkWindow* _tmp33_ = NULL;
-			GdkWindow* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
-			gint _tmp36_ = 0;
+			GtkWindow* _tmp35_ = NULL;
+			GtkWindow* _tmp36_ = NULL;
+			GdkWindow* _tmp37_ = NULL;
+			gint _tmp38_ = 0;
+			gint _tmp39_ = 0;
 			GtkAllocation viewport_allocation = {0};
-			GtkViewport* _tmp37_ = NULL;
-			GtkAllocation _tmp38_ = {0};
+			GtkViewport* _tmp40_ = NULL;
+			GtkAllocation _tmp41_ = {0};
 			gint cx = 0;
 			gint cy = 0;
 			gint cwidth = 0;
 			gint cheight = 0;
-			GtkAllocation _tmp39_ = {0};
-			gint _tmp40_ = 0;
-			GtkAllocation _tmp41_ = {0};
-			gint _tmp42_ = 0;
-			GtkAllocation _tmp43_ = {0};
-			gint _tmp44_ = 0;
-			GtkAllocation _tmp45_ = {0};
-			gint _tmp46_ = 0;
+			GtkAllocation _tmp42_ = {0};
+			gint _tmp43_ = 0;
+			GtkAllocation _tmp44_ = {0};
+			gint _tmp45_ = 0;
+			GtkAllocation _tmp46_ = {0};
 			gint _tmp47_ = 0;
-			gint _tmp56_ = 0;
-			gint _tmp57_ = 0;
-			gint _tmp58_ = 0;
-			GtkAllocation _tmp59_ = {0};
+			GtkAllocation _tmp48_ = {0};
+			gint _tmp49_ = 0;
+			gint _tmp50_ = 0;
+			gint _tmp59_ = 0;
 			gint _tmp60_ = 0;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp33_ = _tmp32_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp34_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gdk_window_get_root_origin (_tmp34_, &_tmp35_, &_tmp36_);
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			rx = _tmp35_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			ry = _tmp36_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp33_);
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), &_tmp38_);
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			viewport_allocation = _tmp38_;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp39_ = viewport_allocation;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp40_ = _tmp39_.x;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cx = _tmp40_;
+			gint _tmp61_ = 0;
+			GtkAllocation _tmp62_ = {0};
+			gint _tmp63_ = 0;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp36_ = _tmp35_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp37_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			gdk_window_get_root_origin (_tmp37_, &_tmp38_, &_tmp39_);
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			rx = _tmp38_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			ry = _tmp39_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp36_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp41_ = viewport_allocation;
+			_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp42_ = _tmp41_.y;
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), &_tmp41_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cy = _tmp42_;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp43_ = viewport_allocation;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp44_ = _tmp43_.width;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cwidth = _tmp44_;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp45_ = viewport_allocation;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp46_ = _tmp45_.height;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cheight = _tmp46_;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13971 "PhotoPage.c"
-				gint _tmp48_ = 0;
-				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				GtkAllocation _tmp51_ = {0};
-				gint _tmp52_ = 0;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp48_ = rx;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp49_ = cx;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp50_ = cwidth;
+			viewport_allocation = _tmp41_;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp42_ = viewport_allocation;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp43_ = _tmp42_.x;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cx = _tmp43_;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp44_ = viewport_allocation;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp45_ = _tmp44_.y;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cy = _tmp45_;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp46_ = viewport_allocation;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp47_ = _tmp46_.width;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cwidth = _tmp47_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp51_ = tool_alloc;
+			_tmp48_ = viewport_allocation;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp52_ = _tmp51_.width;
+			_tmp49_ = _tmp48_.height;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2);
-#line 13989 "PhotoPage.c"
-			} else {
+			cheight = _tmp49_;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
+#line 14000 "PhotoPage.c"
+				gint _tmp51_ = 0;
+				gint _tmp52_ = 0;
 				gint _tmp53_ = 0;
-				gint _tmp54_ = 0;
+				GtkAllocation _tmp54_ = {0};
 				gint _tmp55_ = 0;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp53_ = rx;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp54_ = cx;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp55_ = cwidth;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2);
-#line 14002 "PhotoPage.c"
-			}
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp47_;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp56_ = ry;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp57_ = cy;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp58_ = cheight;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp59_ = tool_alloc;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp60_ = _tmp59_.height;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3);
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp51_ = rx;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp52_ = cx;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp53_ = cwidth;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp54_ = tool_alloc;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp55_ = _tmp54_.width;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
 #line 14018 "PhotoPage.c"
+			} else {
+				gint _tmp56_ = 0;
+				gint _tmp57_ = 0;
+				gint _tmp58_ = 0;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp56_ = rx;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp57_ = cx;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp58_ = cwidth;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
+#line 14031 "PhotoPage.c"
+			}
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			x = _tmp50_;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp59_ = ry;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp60_ = cy;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp61_ = cheight;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp62_ = tool_alloc;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp63_ = _tmp62_.height;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
+#line 14047 "PhotoPage.c"
 		} else {
-			GtkWindow* _tmp61_ = NULL;
-			GtkWindow* _tmp62_ = NULL;
+			GtkWindow* _tmp64_ = NULL;
+			GtkWindow* _tmp65_ = NULL;
 			GtkAllocation toolbar_alloc = {0};
-			GtkToolbar* _tmp63_ = NULL;
-			GtkToolbar* _tmp64_ = NULL;
-			GtkAllocation _tmp65_ = {0};
+			GtkToolbar* _tmp66_ = NULL;
+			GtkToolbar* _tmp67_ = NULL;
+			GtkAllocation _tmp68_ = {0};
 			GdkScreen* screen = NULL;
-			GtkWindow* _tmp66_ = NULL;
-			GtkWindow* _tmp67_ = NULL;
-			GdkScreen* _tmp68_ = NULL;
-			GdkScreen* _tmp69_ = NULL;
-			GdkScreen* _tmp70_ = NULL;
+			GtkWindow* _tmp69_ = NULL;
+			GtkWindow* _tmp70_ = NULL;
 			GdkScreen* _tmp71_ = NULL;
-			gint _tmp72_ = 0;
+			GdkScreen* _tmp72_ = NULL;
 			GdkScreen* _tmp73_ = NULL;
-			gint _tmp74_ = 0;
-			GtkAllocation _tmp75_ = {0};
-			gint _tmp76_ = 0;
-			GtkAllocation _tmp77_ = {0};
-			gint _tmp78_ = 0;
-			EditingToolsEditingTool* _tmp79_ = NULL;
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp61_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp62_ = _tmp61_;
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp62_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp63_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp64_ = _tmp63_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), &_tmp65_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			toolbar_alloc = _tmp65_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp64_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp66_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp67_ = _tmp66_;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp68_ = gtk_window_get_screen (_tmp67_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp69_ = _g_object_ref0 (_tmp68_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp70_ = _tmp69_;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp67_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			screen = _tmp70_;
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp71_ = screen;
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp72_ = gdk_screen_get_width (_tmp71_);
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp72_;
-#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp73_ = screen;
-#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp74_ = gdk_screen_get_height (_tmp73_);
+			GdkScreen* _tmp74_ = NULL;
+			gint _tmp75_ = 0;
+			GdkScreen* _tmp76_ = NULL;
+			gint _tmp77_ = 0;
+			GtkAllocation _tmp78_ = {0};
+			gint _tmp79_ = 0;
+			GtkAllocation _tmp80_ = {0};
+			gint _tmp81_ = 0;
+			EditingToolsEditingTool* _tmp82_ = NULL;
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp65_ = _tmp64_;
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp65_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp75_ = toolbar_alloc;
+			_tmp66_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp76_ = _tmp75_.height;
+			_tmp67_ = _tmp66_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp77_ = tool_alloc;
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), &_tmp68_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp78_ = _tmp77_.height;
+			toolbar_alloc = _tmp68_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp74_ - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
+			_g_object_unref0 (_tmp67_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp69_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp70_ = _tmp69_;
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp71_ = gtk_window_get_screen (_tmp70_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp72_ = _g_object_ref0 (_tmp71_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp73_ = _tmp72_;
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp70_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			screen = _tmp73_;
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp74_ = screen;
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp75_ = gdk_screen_get_width (_tmp74_);
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			x = _tmp75_;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp79_ = self->priv->current_tool;
+			_tmp76_ = screen;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14097 "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 14103 "PhotoPage.c"
-			} else {
-				gint _tmp81_ = 0;
-				GtkAllocation _tmp82_ = {0};
+			_tmp77_ = gdk_screen_get_height (_tmp76_);
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp78_ = toolbar_alloc;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp79_ = _tmp78_.height;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp80_ = tool_alloc;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp81_ = _tmp80_.height;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			y = ((_tmp77_ - _tmp79_) - _tmp81_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
+#line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp82_ = self->priv->current_tool;
+#line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
+#line 14126 "PhotoPage.c"
 				gint _tmp83_ = 0;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp81_ = x;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp82_ = tool_alloc;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp83_ = _tmp82_.width;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				x = (_tmp81_ - _tmp83_) / 2;
-#line 14116 "PhotoPage.c"
+#line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp83_ = x;
+#line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				x = (_tmp83_ * 3) / 4;
+#line 14132 "PhotoPage.c"
+			} else {
+				gint _tmp84_ = 0;
+				GtkAllocation _tmp85_ = {0};
+				gint _tmp86_ = 0;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp84_ = x;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp85_ = tool_alloc;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp86_ = _tmp85_.width;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				x = (_tmp84_ - _tmp86_) / 2;
+#line 14145 "PhotoPage.c"
 			}
-#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14120 "PhotoPage.c"
+#line 14149 "PhotoPage.c"
 		}
 	}
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp85_ = _tmp84_;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_ = gtk_window_get_screen (_tmp85_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp87_ = _g_object_ref0 (_tmp86_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp87_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp88_ = _tmp87_;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp85_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	screen = _tmp88_;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_ = x;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp90_ = screen;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp91_ = gdk_screen_get_width (_tmp90_);
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_ = tool_alloc;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp93_ = _tmp92_.width;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp94_ = CLAMP (_tmp89_, 0, _tmp91_ - _tmp93_);
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp94_;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_ = y;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp96_ = screen;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = gdk_screen_get_height (_tmp96_);
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_ = tool_alloc;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99_ = _tmp98_.height;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp100_ = CLAMP (_tmp95_, 0, _tmp97_ - _tmp99_);
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp100_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_ = tool_window;
+	_tmp89_ = gtk_window_get_screen (_tmp88_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp102_ = x;
+	_tmp90_ = _g_object_ref0 (_tmp89_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp103_ = y;
+	_tmp91_ = _tmp90_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow), _tmp102_, _tmp103_);
+	_g_object_unref0 (_tmp88_);
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	screen = _tmp91_;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_ = tool_window;
+	_tmp92_ = x;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
+	_tmp93_ = screen;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp94_ = gdk_screen_get_width (_tmp93_);
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp95_ = tool_alloc;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp96_ = _tmp95_.width;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp97_ = CLAMP (_tmp92_, 0, _tmp94_ - _tmp96_);
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	x = _tmp97_;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp105_ = tool_window;
+	_tmp98_ = y;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_window_get_type (), GtkWindow));
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp99_ = screen;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp100_ = gdk_screen_get_height (_tmp99_);
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp101_ = tool_alloc;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp102_ = _tmp101_.height;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp103_ = CLAMP (_tmp98_, 0, _tmp100_ - _tmp102_);
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	y = _tmp103_;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp104_ = tool_window;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp105_ = x;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp106_ = y;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_window_get_type (), GtkWindow), _tmp105_, _tmp106_);
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp107_ = tool_window;
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget));
+#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp108_ = tool_window;
+#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_window_get_type (), GtkWindow));
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (screen);
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14185 "PhotoPage.c"
+#line 14214 "PhotoPage.c"
 }
 
 
@@ -14208,72 +14237,72 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	DataView* next = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14219 "PhotoPage.c"
+#line 14248 "PhotoPage.c"
 	}
-#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "current_photo != null");
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14257 "PhotoPage.c"
+#line 14286 "PhotoPage.c"
 	}
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14265 "PhotoPage.c"
+#line 14294 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14272 "PhotoPage.c"
+#line 14301 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14287,88 +14316,88 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14288 "PhotoPage.c"
+#line 14317 "PhotoPage.c"
 			}
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = next;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_);
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next);
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next = _tmp17_;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = next;
-#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14312 "PhotoPage.c"
+#line 14341 "PhotoPage.c"
 			}
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14324 "PhotoPage.c"
+#line 14353 "PhotoPage.c"
 			}
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
-#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = next_photo;
-#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14336 "PhotoPage.c"
+#line 14365 "PhotoPage.c"
 			}
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14348 "PhotoPage.c"
+#line 14377 "PhotoPage.c"
 			}
-#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
-#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp25_);
-#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next_photo);
-#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14358 "PhotoPage.c"
+#line 14387 "PhotoPage.c"
 		}
 	}
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14367 "PhotoPage.c"
+#line 14396 "PhotoPage.c"
 }
 
 
@@ -14390,72 +14419,72 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	DataView* previous = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14401 "PhotoPage.c"
+#line 14430 "PhotoPage.c"
 	}
-#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "current_photo != null");
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14439 "PhotoPage.c"
+#line 14468 "PhotoPage.c"
 	}
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14447 "PhotoPage.c"
+#line 14476 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14454 "PhotoPage.c"
+#line 14483 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14469,114 +14498,114 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14470 "PhotoPage.c"
+#line 14499 "PhotoPage.c"
 			}
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = previous;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_);
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous);
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous = _tmp17_;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = previous;
-#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14494 "PhotoPage.c"
+#line 14523 "PhotoPage.c"
 			}
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14506 "PhotoPage.c"
+#line 14535 "PhotoPage.c"
 			}
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
-#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = previous_photo;
-#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14518 "PhotoPage.c"
+#line 14547 "PhotoPage.c"
 			}
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14530 "PhotoPage.c"
+#line 14559 "PhotoPage.c"
 			}
-#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
-#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp25_);
-#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous_photo);
-#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14540 "PhotoPage.c"
+#line 14569 "PhotoPage.c"
 		}
 	}
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (previous);
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14549 "PhotoPage.c"
+#line 14578 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_ != NULL;
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14564 "PhotoPage.c"
+#line 14593 "PhotoPage.c"
 }
 
 
 void editing_host_page_unset_view_collection (EditingHostPage* self) {
-#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14575 "PhotoPage.c"
+#line 14604 "PhotoPage.c"
 }
 
 
@@ -14663,14 +14692,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 14662 "PhotoPage.c"
+#line 14691 "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 14669 "PhotoPage.c"
+#line 14698 "PhotoPage.c"
 }
 
 
@@ -14683,7 +14712,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 14682 "PhotoPage.c"
+#line 14711 "PhotoPage.c"
 }
 
 
@@ -14696,14 +14725,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 14695 "PhotoPage.c"
+#line 14724 "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 14702 "PhotoPage.c"
+#line 14731 "PhotoPage.c"
 }
 
 
@@ -14715,7 +14744,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 14714 "PhotoPage.c"
+#line 14743 "PhotoPage.c"
 }
 
 
@@ -14834,7 +14863,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 14833 "PhotoPage.c"
+#line 14862 "PhotoPage.c"
 }
 
 
@@ -14902,7 +14931,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 14901 "PhotoPage.c"
+#line 14930 "PhotoPage.c"
 }
 
 
@@ -14918,31 +14947,31 @@ static void editing_host_page_finalize (GObject* obj) {
 	guint _tmp7_ = 0U;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->sources;
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
 #line 390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -14986,7 +15015,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 14985 "PhotoPage.c"
+#line 15014 "PhotoPage.c"
 }
 
 
@@ -15003,366 +15032,366 @@ 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"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15004 "PhotoPage.c"
+#line 15033 "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"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15011 "PhotoPage.c"
+#line 15040 "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"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15018 "PhotoPage.c"
+#line 15047 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15025 "PhotoPage.c"
+#line 15054 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15032 "PhotoPage.c"
+#line 15061 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15039 "PhotoPage.c"
+#line 15068 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15046 "PhotoPage.c"
+#line 15075 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15053 "PhotoPage.c"
+#line 15082 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15060 "PhotoPage.c"
+#line 15089 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15067 "PhotoPage.c"
+#line 15096 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15074 "PhotoPage.c"
+#line 15103 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15081 "PhotoPage.c"
+#line 15110 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15088 "PhotoPage.c"
+#line 15117 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15095 "PhotoPage.c"
+#line 15124 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15102 "PhotoPage.c"
+#line 15131 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15109 "PhotoPage.c"
+#line 15138 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15116 "PhotoPage.c"
+#line 15145 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15123 "PhotoPage.c"
+#line 15152 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15130 "PhotoPage.c"
+#line 15159 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15137 "PhotoPage.c"
+#line 15166 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15144 "PhotoPage.c"
+#line 15173 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15151 "PhotoPage.c"
+#line 15180 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15158 "PhotoPage.c"
+#line 15187 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15165 "PhotoPage.c"
+#line 15194 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15172 "PhotoPage.c"
+#line 15201 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15179 "PhotoPage.c"
+#line 15208 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15186 "PhotoPage.c"
+#line 15215 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15193 "PhotoPage.c"
+#line 15222 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15200 "PhotoPage.c"
+#line 15229 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15207 "PhotoPage.c"
+#line 15236 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15214 "PhotoPage.c"
+#line 15243 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15221 "PhotoPage.c"
+#line 15250 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15228 "PhotoPage.c"
+#line 15257 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15235 "PhotoPage.c"
+#line 15264 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15242 "PhotoPage.c"
+#line 15271 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15249 "PhotoPage.c"
+#line 15278 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15256 "PhotoPage.c"
+#line 15285 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15263 "PhotoPage.c"
+#line 15292 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15270 "PhotoPage.c"
+#line 15299 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15277 "PhotoPage.c"
+#line 15306 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15284 "PhotoPage.c"
+#line 15313 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15291 "PhotoPage.c"
+#line 15320 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15298 "PhotoPage.c"
+#line 15327 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15305 "PhotoPage.c"
+#line 15334 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15312 "PhotoPage.c"
+#line 15341 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15319 "PhotoPage.c"
+#line 15348 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15326 "PhotoPage.c"
+#line 15355 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15333 "PhotoPage.c"
+#line 15362 "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"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15340 "PhotoPage.c"
+#line 15369 "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"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15347 "PhotoPage.c"
+#line 15376 "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"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15354 "PhotoPage.c"
+#line 15383 "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"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15361 "PhotoPage.c"
+#line 15390 "PhotoPage.c"
 }
 
 
@@ -15380,62 +15409,62 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
 	LibraryPhotoSourceCollection* _tmp10_ = NULL;
 	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
-#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo");
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = library_photo_global;
-#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0);
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->filter;
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = library_photo_global;
-#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0);
-#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = library_photo_global;
-#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15427 "PhotoPage.c"
+#line 15456 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_new (void) {
-#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15434 "PhotoPage.c"
+#line 15463 "PhotoPage.c"
 }
 
 
@@ -15446,55 +15475,55 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	MediaSource* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
-#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = view;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp4_;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15465 "PhotoPage.c"
+#line 15494 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->filter;
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15479 "PhotoPage.c"
+#line 15508 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (relinked));
-#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->filter;
-#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15493 "PhotoPage.c"
+#line 15522 "PhotoPage.c"
 }
 
 
@@ -15503,44 +15532,44 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
-#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = ui_filenames;
-#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = ui_filenames;
-#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15518 "PhotoPage.c"
+#line 15547 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new16 (gboolean value) {
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15525 "PhotoPage.c"
+#line 15554 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new17 (const gchar* value) {
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15532 "PhotoPage.c"
+#line 15561 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15539 "PhotoPage.c"
+#line 15568 "PhotoPage.c"
 }
 
 
@@ -15568,137 +15597,137 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	GSimpleAction* _tmp17_ = NULL;
 	GSimpleAction* _tmp18_ = NULL;
 	GActionMap* _tmp19_ = NULL;
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_action_map_add_action_entries (_tmp1_, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15587 "PhotoPage.c"
+#line 15616 "PhotoPage.c"
 	}
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/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 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _variant_new16 (_tmp7_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = config_facade_get_instance ();
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	d = _tmp12_;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = d;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Shotwell";
-#line 15625 "PhotoPage.c"
+#line 15654 "PhotoPage.c"
 	} else {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Camera";
-#line 15629 "PhotoPage.c"
+#line 15658 "PhotoPage.c"
 	}
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = G_VARIANT_TYPE_STRING;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _variant_new17 (_tmp13_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = g_simple_action_new_stateful ("RawDeveloper", _tmp15_, _tmp16_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp16_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp18_;
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (action, "change-state", (GCallback) _library_photo_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
-#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_enabled (action, TRUE);
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = map;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15653 "PhotoPage.c"
+#line 15682 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
 	LibraryPhotoPage * self;
 	GActionMap* _tmp0_ = NULL;
-#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 15668 "PhotoPage.c"
+#line 15697 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection = LIBRARY_PHOTO_PAGE_entries;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 15680 "PhotoPage.c"
+#line 15709 "PhotoPage.c"
 			GActionEntry entry = {0};
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15684 "PhotoPage.c"
+#line 15713 "PhotoPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp1_ = map;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp2_ = entry;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15697 "PhotoPage.c"
+#line 15726 "PhotoPage.c"
 			}
 		}
 	}
@@ -15706,60 +15735,60 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15707 "PhotoPage.c"
+#line 15736 "PhotoPage.c"
 }
 
 
 static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15718 "PhotoPage.c"
+#line 15747 "PhotoPage.c"
 	}
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15724 "PhotoPage.c"
+#line 15753 "PhotoPage.c"
 }
 
 
 static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15735 "PhotoPage.c"
+#line 15764 "PhotoPage.c"
 	}
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15741 "PhotoPage.c"
+#line 15770 "PhotoPage.c"
 }
 
 
 static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15752 "PhotoPage.c"
+#line 15781 "PhotoPage.c"
 	}
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15758 "PhotoPage.c"
+#line 15787 "PhotoPage.c"
 }
 
 
@@ -15791,85 +15820,85 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups = _tmp1_;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = injection_group_new ("PrintPlaceholder");
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	print_group = _tmp2_;
-#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("_Print");
-#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = groups;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _injection_group_ref0 (print_group);
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_);
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = injection_group_new ("PublishPlaceholder");
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	publish_group = _tmp6_;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _ ("_Publish");
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p");
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = groups;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _injection_group_ref0 (publish_group);
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	bg_group = _tmp10_;
-#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _ ("Set as _Desktop Background");
-#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = groups;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _injection_group_ref0 (bg_group);
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = groups;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (result_length1) {
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 15856 "PhotoPage.c"
+#line 15885 "PhotoPage.c"
 	}
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp14_;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (publish_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15868 "PhotoPage.c"
+#line 15897 "PhotoPage.c"
 }
 
 
@@ -15881,33 +15910,33 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	display = _tmp1_;
-#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, display);
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = action;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = value;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15906 "PhotoPage.c"
+#line 15935 "PhotoPage.c"
 }
 
 
@@ -15916,38 +15945,38 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	GAction* _tmp0_ = NULL;
 	GSimpleAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL;
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15925 "PhotoPage.c"
+#line 15954 "PhotoPage.c"
 	}
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = action;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15933 "PhotoPage.c"
+#line 15962 "PhotoPage.c"
 		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = display;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15942 "PhotoPage.c"
+#line 15971 "PhotoPage.c"
 	}
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15946 "PhotoPage.c"
+#line 15975 "PhotoPage.c"
 }
 
 
@@ -15985,241 +16014,241 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	gboolean _tmp56_ = FALSE;
 	gint _tmp61_ = 0;
 	gint _tmp62_ = 0;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple = _tmp3_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = 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"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 16002 "PhotoPage.c"
+#line 16031 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_);
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp8_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 16016 "PhotoPage.c"
+#line 16045 "PhotoPage.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16020 "PhotoPage.c"
+#line 16049 "PhotoPage.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 16028 "PhotoPage.c"
+#line 16057 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = photo_get_master_file_format (_tmp12_);
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 16042 "PhotoPage.c"
+#line 16071 "PhotoPage.c"
 	} else {
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16046 "PhotoPage.c"
+#line 16075 "PhotoPage.c"
 	}
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16054 "PhotoPage.c"
+#line 16083 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = config_facade_get_instance ();
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = g_strcmp0 (_tmp19_, "") != 0;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp19_);
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16073 "PhotoPage.c"
+#line 16102 "PhotoPage.c"
 	} else {
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16077 "PhotoPage.c"
+#line 16106 "PhotoPage.c"
 	}
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16085 "PhotoPage.c"
+#line 16114 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = photo_has_transformations (_tmp24_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp26_) {
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16105 "PhotoPage.c"
+#line 16134 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = _tmp27_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = photo_has_editable (_tmp28_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = _tmp29_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16120 "PhotoPage.c"
+#line 16149 "PhotoPage.c"
 		}
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16124 "PhotoPage.c"
+#line 16153 "PhotoPage.c"
 	} else {
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16128 "PhotoPage.c"
+#line 16157 "PhotoPage.c"
 	}
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16136 "PhotoPage.c"
+#line 16165 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16142 "PhotoPage.c"
+#line 16171 "PhotoPage.c"
 	} else {
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16146 "PhotoPage.c"
+#line 16175 "PhotoPage.c"
 	}
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16154 "PhotoPage.c"
+#line 16183 "PhotoPage.c"
 	}
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_);
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16164 "PhotoPage.c"
+#line 16193 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = photo_has_color_adjustments (_tmp37_);
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = _tmp38_;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16178 "PhotoPage.c"
+#line 16207 "PhotoPage.c"
 	} else {
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16182 "PhotoPage.c"
+#line 16211 "PhotoPage.c"
 	}
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = multiple;
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_);
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = multiple;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_);
-#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = rotate_possible;
-#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_);
-#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = rotate_possible;
-#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_);
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = rotate_possible;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_);
-#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = rotate_possible;
-#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_);
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16218 "PhotoPage.c"
+#line 16247 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -16228,134 +16257,134 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		Photo* _tmp52_ = NULL;
 		Scaling _tmp53_ = {0};
 		gboolean _tmp54_ = FALSE;
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp49_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp48_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = _tmp51_;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp53_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16251 "PhotoPage.c"
+#line 16280 "PhotoPage.c"
 	}
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp56_ = is_raw;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16259 "PhotoPage.c"
+#line 16288 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
 		gchar* _tmp60_ = NULL;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = config_facade_get_instance ();
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = g_strcmp0 (_tmp60_, "") != 0;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp60_);
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16278 "PhotoPage.c"
+#line 16307 "PhotoPage.c"
 	} else {
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16282 "PhotoPage.c"
+#line 16311 "PhotoPage.c"
 	}
-#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = selected_count;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = count;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_);
-#line 16292 "PhotoPage.c"
+#line 16321 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16305 "PhotoPage.c"
+#line 16334 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = photo_has_transformations (_tmp4_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16325 "PhotoPage.c"
+#line 16354 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp7_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo_has_editable (_tmp8_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp9_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16340 "PhotoPage.c"
+#line 16369 "PhotoPage.c"
 		}
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16344 "PhotoPage.c"
+#line 16373 "PhotoPage.c"
 	} else {
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16348 "PhotoPage.c"
+#line 16377 "PhotoPage.c"
 	}
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16354 "PhotoPage.c"
+#line 16383 "PhotoPage.c"
 }
 
 
@@ -16365,78 +16394,78 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GQuark _tmp4_ = 0U;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label0 = 0;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16368 "PhotoPage.c"
+#line 16397 "PhotoPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 2543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16390 "PhotoPage.c"
+#line 16419 "PhotoPage.c"
 			default:
 			{
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
-#line 2548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16397 "PhotoPage.c"
+#line 16426 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16403 "PhotoPage.c"
+#line 16432 "PhotoPage.c"
 			default:
 			{
-#line 2550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
-#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16410 "PhotoPage.c"
+#line 16439 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16416 "PhotoPage.c"
+#line 16445 "PhotoPage.c"
 			default:
 			{
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16421 "PhotoPage.c"
+#line 16450 "PhotoPage.c"
 			}
 		}
 	}
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = developer;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_developer_changed (self, _tmp5_);
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = action;
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = value;
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16435 "PhotoPage.c"
+#line 16464 "PhotoPage.c"
 }
 
 
@@ -16460,106 +16489,106 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	gboolean _tmp19_ = FALSE;
 	Photo* _tmp20_ = NULL;
 	gboolean _tmp21_ = FALSE;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16473 "PhotoPage.c"
+#line 16502 "PhotoPage.c"
 	}
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = gee_list_get (_tmp7_, 0);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = (DataView*) _tmp8_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = data_view_get_source (_tmp9_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16495 "PhotoPage.c"
+#line 16524 "PhotoPage.c"
 	}
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp12_;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = photo;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == NULL) {
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16513 "PhotoPage.c"
+#line 16542 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
 		RawDeveloper _tmp17_ = 0;
 		gboolean _tmp18_ = FALSE;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = rd;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo_get_raw_developer (_tmp16_);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16529 "PhotoPage.c"
+#line 16558 "PhotoPage.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16537 "PhotoPage.c"
+#line 16566 "PhotoPage.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = photo_has_transformations (_tmp20_);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16547 "PhotoPage.c"
+#line 16576 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16554 "PhotoPage.c"
+#line 16583 "PhotoPage.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16558 "PhotoPage.c"
+#line 16587 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -16571,73 +16600,73 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		CommandManager* _tmp30_ = NULL;
 		CommandManager* _tmp31_ = NULL;
 		SetRawDeveloperCommand* _tmp32_ = NULL;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_selected (_tmp24_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = rd;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = _tmp28_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp29_;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = command;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp31_);
-#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16604 "PhotoPage.c"
+#line 16633 "PhotoPage.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16608 "PhotoPage.c"
+#line 16637 "PhotoPage.c"
 }
 
 
 void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16617 "PhotoPage.c"
+#line 16646 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16629 "PhotoPage.c"
+#line 16658 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16636 "PhotoPage.c"
+#line 16665 "PhotoPage.c"
 }
 
 
@@ -16648,75 +16677,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	Photo* _tmp9_ = NULL;
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (return_page));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = return_page;
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = _tmp1_;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = return_page;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/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 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = view;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16671 "PhotoPage.c"
+#line 16700 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _data_collection_ref0 (_tmp5_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16682 "PhotoPage.c"
+#line 16711 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16694 "PhotoPage.c"
+#line 16723 "PhotoPage.c"
 	}
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/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 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16702 "PhotoPage.c"
+#line 16731 "PhotoPage.c"
 }
 
 
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
-#line 2596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 16715 "PhotoPage.c"
+#line 16744 "PhotoPage.c"
 }
 
 
@@ -16724,17 +16753,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_ = NULL;
 	CollectionPage* _tmp1_ = NULL;
-#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16733 "PhotoPage.c"
+#line 16762 "PhotoPage.c"
 }
 
 
@@ -16745,77 +16774,77 @@ static void library_photo_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp1_ != NULL, "get_photo() != null");
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2617 "/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 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/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 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, _tmp4_);
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16770 "PhotoPage.c"
+#line 16799 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_switching_from (Page* base) {
 	LibraryPhotoPage * self;
-#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 16780 "PhotoPage.c"
+#line 16809 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection = LIBRARY_PHOTO_PAGE_entries;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 16792 "PhotoPage.c"
+#line 16821 "PhotoPage.c"
 			GActionEntry entry = {0};
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16796 "PhotoPage.c"
+#line 16825 "PhotoPage.c"
 			{
 				AppWindow* _tmp0_ = NULL;
 				AppWindow* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp0_ = app_window_get_instance ();
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp1_ = _tmp0_;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp2_ = entry;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp1_);
-#line 16814 "PhotoPage.c"
+#line 16843 "PhotoPage.c"
 			}
 		}
 	}
@@ -16833,58 +16862,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	gint _tmp8_ = 0;
 	GdkPixbuf* _tmp9_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
-#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/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 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16840 "PhotoPage.c"
+#line 16869 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/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 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16855 "PhotoPage.c"
+#line 16884 "PhotoPage.c"
 	}
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16863 "PhotoPage.c"
+#line 16892 "PhotoPage.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scale;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp10_;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16883 "PhotoPage.c"
+#line 16912 "PhotoPage.c"
 }
 
 
@@ -16894,46 +16923,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 2636 "/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 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/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 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16901 "PhotoPage.c"
+#line 16930 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16916 "PhotoPage.c"
+#line 16945 "PhotoPage.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16924 "PhotoPage.c"
+#line 16953 "PhotoPage.c"
 	}
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp5_;
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16932 "PhotoPage.c"
+#line 16961 "PhotoPage.c"
 }
 
 
@@ -16949,51 +16978,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* _tmp7_ = NULL;
 	SlideshowPage* _tmp8_ = NULL;
 	SlideshowPage* _tmp9_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/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 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16962 "PhotoPage.c"
+#line 16991 "PhotoPage.c"
 	}
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/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 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page));
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16992 "PhotoPage.c"
+#line 17021 "PhotoPage.c"
 }
 
 
@@ -17004,73 +17033,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/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 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 17011 "PhotoPage.c"
+#line 17040 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 17017 "PhotoPage.c"
+#line 17046 "PhotoPage.c"
 	} else {
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17021 "PhotoPage.c"
+#line 17050 "PhotoPage.c"
 	}
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/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 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 17031 "PhotoPage.c"
+#line 17060 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 17037 "PhotoPage.c"
+#line 17066 "PhotoPage.c"
 	} else {
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17041 "PhotoPage.c"
+#line 17070 "PhotoPage.c"
 	}
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17045 "PhotoPage.c"
+#line 17074 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2661 "/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 2662 "/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 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17057 "PhotoPage.c"
+#line 17086 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2668 "/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 2666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17069 "PhotoPage.c"
+#line 17098 "PhotoPage.c"
 }
 
 
@@ -17082,43 +17111,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 	GdkEventKey* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	const gchar* _tmp4_ = NULL;
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/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 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17095 "PhotoPage.c"
+#line 17124 "PhotoPage.c"
 	}
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
-#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17111 "PhotoPage.c"
+#line 17140 "PhotoPage.c"
 	} else {
-#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17117 "PhotoPage.c"
+#line 17146 "PhotoPage.c"
 	}
 }
 
@@ -17128,77 +17157,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	gboolean sensitivity = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 2684 "/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), "SendTo", sensitivity);
-#line 2685 "/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), "Publish", sensitivity);
-#line 2686 "/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), "Print", sensitivity);
-#line 2687 "/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), "CommonJumpToFile", sensitivity);
-#line 2689 "/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), "CommonUndo", sensitivity);
-#line 2690 "/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), "CommonRedo", sensitivity);
-#line 2692 "/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), "IncreaseSize", sensitivity);
-#line 2693 "/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), "DecreaseSize", sensitivity);
-#line 2694 "/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), "ZoomFit", sensitivity);
-#line 2695 "/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), "Zoom100", sensitivity);
-#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", sensitivity);
-#line 2697 "/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), "Slideshow", sensitivity);
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", sensitivity);
-#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", sensitivity);
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity);
-#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", sensitivity);
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", sensitivity);
-#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", sensitivity);
-#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", sensitivity);
-#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity);
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", sensitivity);
-#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity);
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity);
-#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity);
-#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity);
-#line 2713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity);
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity);
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity);
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity);
-#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_);
-#line 17197 "PhotoPage.c"
+#line 17226 "PhotoPage.c"
 }
 
 
@@ -17207,36 +17236,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17214 "PhotoPage.c"
+#line 17243 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17220 "PhotoPage.c"
+#line 17249 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17227 "PhotoPage.c"
+#line 17256 "PhotoPage.c"
 	}
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = missing;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_);
-#line 17235 "PhotoPage.c"
+#line 17264 "PhotoPage.c"
 }
 
 
@@ -17250,300 +17279,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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label6 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label7 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label8 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label9 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label10 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label11 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label12 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label13 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label14 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label15 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label16 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label17 = 0;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17291 "PhotoPage.c"
+#line 17320 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17300 "PhotoPage.c"
+#line 17329 "PhotoPage.c"
 	} else {
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17304 "PhotoPage.c"
+#line 17333 "PhotoPage.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17312 "PhotoPage.c"
+#line 17341 "PhotoPage.c"
 	}
-#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17330 "PhotoPage.c"
+#line 17359 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
 				GtkWindow* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = _tmp9_;
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp10_);
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp11_) {
-#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17348 "PhotoPage.c"
+#line 17377 "PhotoPage.c"
 				}
-#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17352 "PhotoPage.c"
+#line 17381 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17358 "PhotoPage.c"
+#line 17387 "PhotoPage.c"
 			default:
 			{
-#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
-#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17365 "PhotoPage.c"
+#line 17394 "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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17371 "PhotoPage.c"
+#line 17400 "PhotoPage.c"
 			default:
 			{
-#line 2754 "/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), "IncreaseRating");
-#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17378 "PhotoPage.c"
+#line 17407 "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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17384 "PhotoPage.c"
+#line 17413 "PhotoPage.c"
 			default:
 			{
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 2760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17391 "PhotoPage.c"
+#line 17420 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17397 "PhotoPage.c"
+#line 17426 "PhotoPage.c"
 			default:
 			{
-#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17404 "PhotoPage.c"
+#line 17433 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17410 "PhotoPage.c"
+#line 17439 "PhotoPage.c"
 			default:
 			{
-#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17417 "PhotoPage.c"
+#line 17446 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17423 "PhotoPage.c"
+#line 17452 "PhotoPage.c"
 			default:
 			{
-#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17430 "PhotoPage.c"
+#line 17459 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17436 "PhotoPage.c"
+#line 17465 "PhotoPage.c"
 			default:
 			{
-#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17443 "PhotoPage.c"
+#line 17472 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17449 "PhotoPage.c"
+#line 17478 "PhotoPage.c"
 			default:
 			{
-#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17456 "PhotoPage.c"
+#line 17485 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17462 "PhotoPage.c"
+#line 17491 "PhotoPage.c"
 			default:
 			{
-#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17469 "PhotoPage.c"
+#line 17498 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17475 "PhotoPage.c"
+#line 17504 "PhotoPage.c"
 			default:
 			{
-#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17482 "PhotoPage.c"
+#line 17511 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17488 "PhotoPage.c"
+#line 17517 "PhotoPage.c"
 			default:
 			{
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17495 "PhotoPage.c"
+#line 17524 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17501 "PhotoPage.c"
+#line 17530 "PhotoPage.c"
 			default:
 			{
-#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17508 "PhotoPage.c"
+#line 17537 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17514 "PhotoPage.c"
+#line 17543 "PhotoPage.c"
 			default:
 			{
-#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17521 "PhotoPage.c"
+#line 17550 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17527 "PhotoPage.c"
+#line 17556 "PhotoPage.c"
 			default:
 			{
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17534 "PhotoPage.c"
+#line 17563 "PhotoPage.c"
 			}
 		}
 	}
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = handled;
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17542 "PhotoPage.c"
+#line 17571 "PhotoPage.c"
 }
 
 
@@ -17554,44 +17583,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	GtkWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
 	FullscreenWindow* _tmp2_ = NULL;
-#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17565 "PhotoPage.c"
+#line 17594 "PhotoPage.c"
 	}
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
-#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fs;
-#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 2813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17575 "PhotoPage.c"
+#line 17604 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17582 "PhotoPage.c"
+#line 17611 "PhotoPage.c"
 	}
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17590 "PhotoPage.c"
+#line 17619 "PhotoPage.c"
 }
 
 
@@ -17601,33 +17630,33 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	gboolean _tmp0_ = FALSE;
 	GdkEventButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_to_collection_on_release;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = FALSE;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17616 "PhotoPage.c"
+#line 17645 "PhotoPage.c"
 	}
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/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 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17626 "PhotoPage.c"
+#line 17655 "PhotoPage.c"
 }
 
 
@@ -17636,13 +17665,13 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp7_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17641 "PhotoPage.c"
+#line 17670 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		GObject* _tmp2_ = NULL;
@@ -17650,41 +17679,41 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		GMenuModel* _tmp4_ = NULL;
 		GtkMenu* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu");
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/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 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		model = _tmp3_;
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = model;
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp5_);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->context_menu = _tmp5_;
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->context_menu;
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/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 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17673 "PhotoPage.c"
+#line 17702 "PhotoPage.c"
 	}
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17683 "PhotoPage.c"
+#line 17712 "PhotoPage.c"
 }
 
 
@@ -17694,25 +17723,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp2_ = NULL;
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/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 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17711 "PhotoPage.c"
+#line 17740 "PhotoPage.c"
 }
 
 
@@ -17721,59 +17750,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17734 "PhotoPage.c"
+#line 17763 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	CollectionPage* _tmp0_ = NULL;
-#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17746 "PhotoPage.c"
+#line 17775 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->return_page;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17760 "PhotoPage.c"
+#line 17789 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp5_);
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17772 "PhotoPage.c"
+#line 17801 "PhotoPage.c"
 	}
 }
 
@@ -17785,29 +17814,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/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 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _ ("Remove From Library");
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("Removing Photo From Library");
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	remove_from_app (photos, _tmp2_, _tmp3_);
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17806 "PhotoPage.c"
+#line 17835 "PhotoPage.c"
 }
 
 
@@ -17832,64 +17861,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	TrashUntrashPhotosCommand* _tmp26_ = NULL;
 	LibraryWindow* _tmp27_ = NULL;
 	LibraryWindow* _tmp28_ = NULL;
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2878 "/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 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17839 "PhotoPage.c"
+#line 17868 "PhotoPage.c"
 	}
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17845 "PhotoPage.c"
+#line 17874 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17856 "PhotoPage.c"
+#line 17885 "PhotoPage.c"
 	}
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photos;
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (_tmp6_, _tmp7_);
-#line 2892 "/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 2896 "/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 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = photo;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/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 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/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 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17888 "PhotoPage.c"
+#line 17917 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -17897,88 +17926,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		gboolean _tmp17_ = FALSE;
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp14_, TRUE);
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17914 "PhotoPage.c"
+#line 17943 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			fullscreen_window_close (_tmp19_);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17925 "PhotoPage.c"
+#line 17954 "PhotoPage.c"
 		}
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17935 "PhotoPage.c"
+#line 17964 "PhotoPage.c"
 	}
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = photos;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp23_);
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = library_window_get_app ();
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = _tmp27_;
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_window_set_page_switching_enabled (_tmp28_, TRUE);
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp28_);
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17965 "PhotoPage.c"
+#line 17994 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17977 "PhotoPage.c"
+#line 18006 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -17992,62 +18021,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		gboolean _tmp10_ = FALSE;
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
-#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_list = _tmp1_;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo_list;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/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 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/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 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_list;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/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 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 18031 "PhotoPage.c"
+#line 18060 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
 	DataSource* _tmp0_ = NULL;
-#line 2920 "/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 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 18046 "PhotoPage.c"
+#line 18075 "PhotoPage.c"
 }
 
 
@@ -18069,100 +18098,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	Photo* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18078 "PhotoPage.c"
+#line 18107 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/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 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/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 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp5_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18096 "PhotoPage.c"
+#line 18125 "PhotoPage.c"
 	}
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18102 "PhotoPage.c"
+#line 18131 "PhotoPage.c"
 	}
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp6_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = photo;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/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 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/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 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = photo;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/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 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/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 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18146 "PhotoPage.c"
+#line 18175 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18157 "PhotoPage.c"
+#line 18186 "PhotoPage.c"
 	}
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18161 "PhotoPage.c"
+#line 18190 "PhotoPage.c"
 }
 
 
@@ -18171,48 +18200,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18184 "PhotoPage.c"
+#line 18213 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18211 "PhotoPage.c"
+#line 18240 "PhotoPage.c"
 	}
 }
 
@@ -18220,55 +18249,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 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18225 "PhotoPage.c"
+#line 18254 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/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 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18244 "PhotoPage.c"
+#line 18273 "PhotoPage.c"
 	} else {
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18248 "PhotoPage.c"
+#line 18277 "PhotoPage.c"
 	}
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18252 "PhotoPage.c"
+#line 18281 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/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 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18267 "PhotoPage.c"
+#line 18296 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -18277,39 +18306,39 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		Photo* _tmp4_ = NULL;
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/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 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_external_editor (_tmp4_, &_inner_error_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18294 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 18323 "PhotoPage.c"
+			goto __catch251_g_error;
 		}
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18305 "PhotoPage.c"
+#line 18334 "PhotoPage.c"
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_ = NULL;
@@ -18317,42 +18346,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		GError* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		Photo* _tmp11_ = NULL;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = err;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/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 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		open_external_editor_error_dialog (_tmp9_, _tmp11_);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18340 "PhotoPage.c"
+#line 18369 "PhotoPage.c"
 	}
-	__finally250:
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally251:
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/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 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18351 "PhotoPage.c"
+#line 18380 "PhotoPage.c"
 	}
 }
 
@@ -18364,31 +18393,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	PhotoFileFormat _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/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 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18371 "PhotoPage.c"
+#line 18400 "PhotoPage.c"
 	}
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_master_file_format (_tmp2_);
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18387 "PhotoPage.c"
+#line 18416 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -18397,39 +18426,39 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		Photo* _tmp8_ = NULL;
 		AppWindow* _tmp9_ = NULL;
 		AppWindow* _tmp10_ = NULL;
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/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 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18414 "PhotoPage.c"
-			goto __catch251_g_error;
+#line 18443 "PhotoPage.c"
+			goto __catch252_g_error;
 		}
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18425 "PhotoPage.c"
+#line 18454 "PhotoPage.c"
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -18437,74 +18466,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = app_window_get_instance ();
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = err;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp15_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18460 "PhotoPage.c"
+#line 18489 "PhotoPage.c"
 	}
-	__finally251:
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally252:
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/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 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18471 "PhotoPage.c"
+#line 18500 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18484 "PhotoPage.c"
+#line 18513 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18503 "PhotoPage.c"
+#line 18532 "PhotoPage.c"
 	}
 }
 
@@ -18536,85 +18565,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	gint _tmp17_ = 0;
 	Scaling _tmp18_ = {0};
 	GError * _inner_error_ = NULL;
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2995 "/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 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18543 "PhotoPage.c"
+#line 18572 "PhotoPage.c"
 	}
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = export_dialog_new (_tmp1_);
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_dialog = _tmp2_;
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	export_dialog = _tmp2_;
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_format_parameters_last (&_tmp3_);
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_params = _tmp3_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = export_dialog;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale = _tmp5_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	constraint = _tmp6_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp7_) {
-#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18571 "PhotoPage.c"
+#line 18600 "PhotoPage.c"
 	}
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = export_params;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = export_ui_choose_file (_tmp12_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	save_as = _tmp14_;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = save_as;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_ == NULL) {
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18603 "PhotoPage.c"
+#line 18632 "PhotoPage.c"
 	}
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = scale;
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 18613 "PhotoPage.c"
+#line 18642 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -18630,48 +18659,48 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		ExportFormatMode _tmp30_ = 0;
 		ExportFormatParameters _tmp31_ = {0};
 		gboolean _tmp32_ = FALSE;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = save_as;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = scaling;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_.quality;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_.mode;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = _tmp31_.export_metadata;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18665 "PhotoPage.c"
-			goto __catch252_g_error;
+#line 18694 "PhotoPage.c"
+			goto __catch253_g_error;
 		}
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally253;
+	__catch253_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp33_ = NULL;
@@ -18682,56 +18711,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		const gchar* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _ ("Unable to export %s: %s");
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = save_as;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = g_file_get_path (_tmp34_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp35_;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = err;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_->message;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = _tmp39_;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp40_, NULL);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp40_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp36_);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18709 "PhotoPage.c"
+#line 18738 "PhotoPage.c"
 	}
-	__finally252:
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally253:
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/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 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18724 "PhotoPage.c"
+#line 18753 "PhotoPage.c"
 	}
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18730 "PhotoPage.c"
+#line 18759 "PhotoPage.c"
 }
 
 
@@ -18740,40 +18769,40 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/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 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18753 "PhotoPage.c"
+#line 18782 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18772 "PhotoPage.c"
+#line 18801 "PhotoPage.c"
 	}
 }
 
@@ -18789,56 +18818,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/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 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18796 "PhotoPage.c"
+#line 18825 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18803 "PhotoPage.c"
+#line 18832 "PhotoPage.c"
 	}
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18809 "PhotoPage.c"
+#line 18838 "PhotoPage.c"
 	}
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/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 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18837 "PhotoPage.c"
+#line 18866 "PhotoPage.c"
 }
 
 
@@ -18853,56 +18882,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/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 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18860 "PhotoPage.c"
+#line 18889 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18867 "PhotoPage.c"
+#line 18896 "PhotoPage.c"
 	}
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18873 "PhotoPage.c"
+#line 18902 "PhotoPage.c"
 	}
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/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 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18901 "PhotoPage.c"
+#line 18930 "PhotoPage.c"
 }
 
 
@@ -18918,121 +18947,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	CommandManager* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	SetRatingSingleCommand* _tmp10_ = NULL;
-#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/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 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18925 "PhotoPage.c"
+#line 18954 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18932 "PhotoPage.c"
+#line 18961 "PhotoPage.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18938 "PhotoPage.c"
+#line 18967 "PhotoPage.c"
 	}
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = rating;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/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 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp7_;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = command;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp9_);
-#line 3051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18968 "PhotoPage.c"
+#line 18997 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18977 "PhotoPage.c"
+#line 19006 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
-#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18986 "PhotoPage.c"
+#line 19015 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
-#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18995 "PhotoPage.c"
+#line 19024 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 19004 "PhotoPage.c"
+#line 19033 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
-#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 19013 "PhotoPage.c"
+#line 19042 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 19022 "PhotoPage.c"
+#line 19051 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 19031 "PhotoPage.c"
+#line 19060 "PhotoPage.c"
 }
 
 
@@ -19066,117 +19095,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	Photo* _tmp26_ = NULL;
 	Rating _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/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 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/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 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/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 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/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 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/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 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/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 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/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 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/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 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/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 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/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 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/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 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/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 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/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 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/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 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/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 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = rating_can_increase (_tmp23_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp22_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/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 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = rating_can_decrease (_tmp27_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19161 "PhotoPage.c"
+#line 19190 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new18 (const gchar* value) {
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19168 "PhotoPage.c"
+#line 19197 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new19 (const gchar* value) {
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19175 "PhotoPage.c"
+#line 19204 "PhotoPage.c"
 }
 
 
@@ -19188,98 +19217,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat _tmp4_ = 0;
 	PhotoFileFormat _tmp5_ = 0;
-#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/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 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	format = _tmp3_;
-#line 3096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = format;
-#line 3096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/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 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = format;
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19209 "PhotoPage.c"
+#line 19238 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		RawDeveloper _tmp8_ = 0;
 		RawDeveloper _tmp9_ = 0;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = photo_get_raw_developer (_tmp7_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (_tmp9_) {
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19228 "PhotoPage.c"
+#line 19257 "PhotoPage.c"
 			{
 				GAction* _tmp10_ = NULL;
 				GAction* _tmp11_ = NULL;
 				GVariant* _tmp12_ = NULL;
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = _tmp10_;
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = _variant_new18 ("Shotwell");
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp11_, _tmp12_);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp12_);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19247 "PhotoPage.c"
+#line 19276 "PhotoPage.c"
 			}
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19253 "PhotoPage.c"
+#line 19282 "PhotoPage.c"
 			{
 				GAction* _tmp13_ = NULL;
 				GAction* _tmp14_ = NULL;
 				GVariant* _tmp15_ = NULL;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp14_ = _tmp13_;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp15_ = _variant_new19 ("Camera");
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp14_, _tmp15_);
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp15_);
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp14_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19272 "PhotoPage.c"
+#line 19301 "PhotoPage.c"
 			}
 			default:
 			{
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19278 "PhotoPage.c"
+#line 19307 "PhotoPage.c"
 			}
 		}
 	}
@@ -19293,60 +19322,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3121 "/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 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/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 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19310 "PhotoPage.c"
+#line 19339 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		Alteration* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/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 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = (Alteration*) _tmp9_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp11_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_alteration_unref0 (_tmp10_);
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19335 "PhotoPage.c"
+#line 19364 "PhotoPage.c"
 	} else {
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19339 "PhotoPage.c"
+#line 19368 "PhotoPage.c"
 	}
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19345 "PhotoPage.c"
+#line 19374 "PhotoPage.c"
 	}
 }
 
@@ -19362,29 +19391,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp0_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = dialog;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = _tmp3_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names_length1 = _tmp2_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_names_size_ = names_length1;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = names;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = names_length1;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19383 "PhotoPage.c"
+#line 19412 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -19401,57 +19430,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		GeeCollection* _tmp16_ = NULL;
 		AddTagsCommand* _tmp17_ = NULL;
 		AddTagsCommand* _tmp18_ = NULL;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = hierarchical_tag_index_get_global_index ();
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = names;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9__length1 = names_length1;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12__length1 = _tmp10_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp8_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19444 "PhotoPage.c"
+#line 19473 "PhotoPage.c"
 	}
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19450 "PhotoPage.c"
+#line 19479 "PhotoPage.c"
 }
 
 
@@ -19476,77 +19505,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp14_ = NULL;
 	ModifyTagsCommand* _tmp15_ = NULL;
 	ModifyTagsCommand* _tmp16_ = NULL;
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_at (_tmp1_, 0);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = data_view_get_source (_tmp3_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp5_;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photo;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp7_;
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = dialog;
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = modify_tags_dialog_execute (_tmp8_);
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_tags = _tmp9_;
-#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = new_tags;
-#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (new_tags);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19519 "PhotoPage.c"
+#line 19548 "PhotoPage.c"
 	}
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_tags;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/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 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_tags);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19545 "PhotoPage.c"
+#line 19574 "PhotoPage.c"
 }
 
 
@@ -19558,53 +19587,53 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	MediaSource* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
-#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = view;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp4_;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19577 "PhotoPage.c"
+#line 19606 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL;
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19587 "PhotoPage.c"
+#line 19616 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER);
-#line 19594 "PhotoPage.c"
+#line 19623 "PhotoPage.c"
 }
 
 
 static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) {
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19603 "PhotoPage.c"
+#line 19632 "PhotoPage.c"
 }
 
 
@@ -19625,69 +19654,69 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) {
 
 
 static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate));
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = library_photo_page_real_init_collect_ui_filenames;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->add_actions = library_photo_page_real_add_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->remove_actions = library_photo_page_real_remove_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_injection_groups = library_photo_page_real_init_collect_injection_groups;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->update_actions = library_photo_page_real_update_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((LibraryPhotoPageClass *) klass)->developer_changed = library_photo_page_real_developer_changed;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switched_to = library_photo_page_real_switched_to;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switching_from = library_photo_page_real_switching_from;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_increase_size = library_photo_page_real_on_increase_size;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_decrease_size = library_photo_page_real_on_decrease_size;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = library_photo_page_real_on_zoom_slider_key_press;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->update_ui = library_photo_page_real_update_ui;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->notify_photo_backing_missing = library_photo_page_real_notify_photo_backing_missing;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((GtkWidgetClass *) klass)->key_press_event = library_photo_page_real_key_press_event;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_double_click = library_photo_page_real_on_double_click;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_left_released = library_photo_page_real_on_left_released;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_buttonpress = library_photo_page_real_on_context_buttonpress;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19670 "PhotoPage.c"
+#line 19699 "PhotoPage.c"
 }
 
 
 static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_to_collection_on_release = FALSE;
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19686 "PhotoPage.c"
+#line 19715 "PhotoPage.c"
 }
 
 
@@ -19700,39 +19729,39 @@ static void library_photo_page_finalize (GObject* obj) {
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self);
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = library_photo_global;
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("external-app-changed", TYPE_CONFIGURATION_FACADE, &_tmp6_, NULL, FALSE);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_view_filter_unref0 (self->priv->filter);
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->context_menu);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19731 "PhotoPage.c"
+#line 19760 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 962c80e..9bed855 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -440,6 +440,9 @@ public abstract class EditingHostPage : SinglePhotoPage {
         rotate_button.clicked.connect(on_rotate_clockwise);
         rotate_button.is_important = true;
         toolbar.insert(rotate_button, -1);
+        unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class(rotate_button.get_class());
+        Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.KP_Space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+        Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
         
         // crop tool
         crop_button = new Gtk.ToggleToolButton ();
@@ -2180,6 +2183,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
             return;
         
         // do this so window size is properly allocated, but window not shown
+        tool_window.set_transient_for(AppWindow.get_instance());
         tool_window.show_all();
         tool_window.hide();
         
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index cc407c0..229c57a 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -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 __catch453_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 __finally453;
+	__catch453_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:
+	__finally453:
 #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 __catch454_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 __finally454;
+	__catch454_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:
+	__finally454:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
diff --git a/src/Printing.c b/src/Printing.c
index 3d74121..8847e70 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -112,6 +112,8 @@ typedef struct _CustomPrintTabPrivate CustomPrintTabPrivate;
 typedef struct _PrintJob PrintJob;
 typedef struct _PrintJobClass PrintJobClass;
 #define _standard_print_size_unref0(var) ((var == NULL) ? NULL : (var = (standard_print_size_unref (var), NULL)))
+
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
 #define _print_settings_unref0(var) ((var == NULL) ? NULL : (var = (print_settings_unref (var), NULL)))
 typedef struct _PrintJobPrivate PrintJobPrivate;
 
@@ -293,21 +295,20 @@ typedef enum  {
 } PrintLayout;
 
 struct _CustomPrintTab {
-	GtkFixed parent_instance;
+	GtkBox parent_instance;
 	CustomPrintTabPrivate * priv;
 };
 
 struct _CustomPrintTabClass {
-	GtkFixedClass parent_class;
+	GtkBoxClass parent_class;
 };
 
 struct _CustomPrintTabPrivate {
-	GtkBox* custom_image_settings_pane;
 	GtkRadioButton* standard_size_radio;
 	GtkRadioButton* custom_size_radio;
 	GtkRadioButton* image_per_page_radio;
-	GtkComboBox* image_per_page_combo;
-	GtkComboBox* standard_sizes_combo;
+	GtkComboBoxText* image_per_page_combo;
+	GtkComboBoxText* standard_sizes_combo;
 	GtkComboBoxText* units_combo;
 	GtkEntry* custom_width_entry;
 	GtkEntry* custom_height_entry;
@@ -322,6 +323,12 @@ struct _CustomPrintTabPrivate {
 	PrintJob* source_job;
 };
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 struct _PrintJob {
 	GtkPrintOperation parent_instance;
 	PrintJobPrivate * priv;
@@ -372,6 +379,9 @@ struct _PrintManagerPrivate {
 	CustomPrintTab* custom_tab;
 	ProgressDialog* progress_dialog;
 	GCancellable* cancellable;
+	StandardPrintSize** standard_sizes;
+	gint standard_sizes_length1;
+	gint _standard_sizes_size_;
 };
 
 typedef enum  {
@@ -505,11 +515,12 @@ enum  {
 #define CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE 1
 CustomPrintTab* custom_print_tab_new (PrintJob* source_job);
 CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_job);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButton* b);
 static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
 static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
 static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position);
 static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
 static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event);
@@ -730,14 +741,14 @@ PrintSettings* print_settings_construct (GType object_type) {
 	_g_object_unref0 (config);
 #line 30 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 734 "Printing.c"
+#line 745 "Printing.c"
 }
 
 
 PrintSettings* print_settings_new (void) {
 #line 30 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_settings_construct (TYPE_PRINT_SETTINGS);
-#line 741 "Printing.c"
+#line 752 "Printing.c"
 }
 
 
@@ -811,7 +822,7 @@ void print_settings_save (PrintSettings* self) {
 	configuration_facade_set_printing_content_ppi (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp13_);
 #line 46 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (config);
-#line 815 "Printing.c"
+#line 826 "Printing.c"
 }
 
 
@@ -827,18 +838,16 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 		case CONTENT_LAYOUT_STANDARD_SIZE:
 #line 63 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 831 "Printing.c"
+#line 842 "Printing.c"
 		{
 			PrintManager* _tmp1_ = NULL;
 			PrintManager* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			StandardPrintSize** _tmp4_ = NULL;
-			StandardPrintSize** _tmp5_ = NULL;
-			gint _tmp5__length1 = 0;
-			gint _tmp6_ = 0;
-			StandardPrintSize* _tmp7_ = NULL;
+			gint _tmp5_ = 0;
+			StandardPrintSize* _tmp6_ = NULL;
+			Measurement _tmp7_ = {0};
 			Measurement _tmp8_ = {0};
-			Measurement _tmp9_ = {0};
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -846,45 +855,39 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = _tmp4_;
+			_tmp5_ = print_settings_get_size_selection (self);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5__length1 = _tmp3_;
+			_tmp6_ = _tmp4_[_tmp5_];
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp6_ = print_settings_get_size_selection (self);
+			_tmp7_ = _tmp6_->width;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp7_ = _tmp5_[_tmp6_];
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp8_ = _tmp7_->width;
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp9_ = _tmp8_;
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+			_tmp8_ = _tmp7_;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_print_manager_unref0 (_tmp2_);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp9_;
+			*result = _tmp8_;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 869 "Printing.c"
+#line 872 "Printing.c"
 		}
 #line 63 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 873 "Printing.c"
+#line 876 "Printing.c"
 		{
-			Measurement _tmp10_ = {0};
+			Measurement _tmp9_ = {0};
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp10_ = self->priv->content_width;
+			_tmp9_ = self->priv->content_width;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp10_;
+			*result = _tmp9_;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 882 "Printing.c"
+#line 885 "Printing.c"
 		}
 		default:
 		{
 #line 73 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:73: unknown ContentLayout enumeration value");
-#line 888 "Printing.c"
+#line 891 "Printing.c"
 		}
 	}
 }
@@ -902,18 +905,16 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 		case CONTENT_LAYOUT_STANDARD_SIZE:
 #line 78 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 906 "Printing.c"
+#line 909 "Printing.c"
 		{
 			PrintManager* _tmp1_ = NULL;
 			PrintManager* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			StandardPrintSize** _tmp4_ = NULL;
-			StandardPrintSize** _tmp5_ = NULL;
-			gint _tmp5__length1 = 0;
-			gint _tmp6_ = 0;
-			StandardPrintSize* _tmp7_ = NULL;
+			gint _tmp5_ = 0;
+			StandardPrintSize* _tmp6_ = NULL;
+			Measurement _tmp7_ = {0};
 			Measurement _tmp8_ = {0};
-			Measurement _tmp9_ = {0};
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -921,45 +922,39 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = _tmp4_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5__length1 = _tmp3_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp6_ = print_settings_get_size_selection (self);
+			_tmp5_ = print_settings_get_size_selection (self);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp7_ = _tmp5_[_tmp6_];
+			_tmp6_ = _tmp4_[_tmp5_];
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp8_ = _tmp7_->height;
+			_tmp7_ = _tmp6_->height;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp9_ = _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+			_tmp8_ = _tmp7_;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_print_manager_unref0 (_tmp2_);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp9_;
+			*result = _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 944 "Printing.c"
+#line 939 "Printing.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 948 "Printing.c"
+#line 943 "Printing.c"
 		{
-			Measurement _tmp10_ = {0};
+			Measurement _tmp9_ = {0};
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp10_ = self->priv->content_height;
+			_tmp9_ = self->priv->content_height;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp10_;
+			*result = _tmp9_;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 957 "Printing.c"
+#line 952 "Printing.c"
 		}
 		default:
 		{
 #line 88 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:88: unknown ContentLayout enumeration value");
-#line 963 "Printing.c"
+#line 958 "Printing.c"
 		}
 	}
 }
@@ -975,7 +970,7 @@ void print_settings_get_minimum_content_dimension (PrintSettings* self, Measurem
 	*result = _tmp0_;
 #line 93 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 979 "Printing.c"
+#line 974 "Printing.c"
 }
 
 
@@ -989,7 +984,7 @@ void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurem
 	*result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 993 "Printing.c"
+#line 988 "Printing.c"
 }
 
 
@@ -1004,7 +999,7 @@ gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1008 "Printing.c"
+#line 1003 "Printing.c"
 }
 
 
@@ -1019,7 +1014,7 @@ gboolean print_settings_is_print_titles_enabled (PrintSettings* self) {
 	result = _tmp0_;
 #line 105 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1023 "Printing.c"
+#line 1018 "Printing.c"
 }
 
 
@@ -1034,7 +1029,7 @@ gint print_settings_get_content_ppi (PrintSettings* self) {
 	result = _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1038 "Printing.c"
+#line 1033 "Printing.c"
 }
 
 
@@ -1049,7 +1044,7 @@ gint print_settings_get_image_per_page_selection (PrintSettings* self) {
 	result = _tmp0_;
 #line 113 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1053 "Printing.c"
+#line 1048 "Printing.c"
 }
 
 
@@ -1064,7 +1059,7 @@ gint print_settings_get_size_selection (PrintSettings* self) {
 	result = _tmp0_;
 #line 117 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1068 "Printing.c"
+#line 1063 "Printing.c"
 }
 
 
@@ -1079,7 +1074,7 @@ ContentLayout print_settings_get_content_layout (PrintSettings* self) {
 	result = _tmp0_;
 #line 121 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1083 "Printing.c"
+#line 1078 "Printing.c"
 }
 
 
@@ -1091,7 +1086,7 @@ void print_settings_set_content_layout (PrintSettings* self, ContentLayout conte
 	_tmp0_ = content_layout;
 #line 125 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_layout = _tmp0_;
-#line 1095 "Printing.c"
+#line 1090 "Printing.c"
 }
 
 
@@ -1105,7 +1100,7 @@ void print_settings_set_content_width (PrintSettings* self, Measurement* content
 	_tmp0_ = *content_width;
 #line 129 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_width = _tmp0_;
-#line 1109 "Printing.c"
+#line 1104 "Printing.c"
 }
 
 
@@ -1119,7 +1114,7 @@ void print_settings_set_content_height (PrintSettings* self, Measurement* conten
 	_tmp0_ = *content_height;
 #line 133 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_height = _tmp0_;
-#line 1123 "Printing.c"
+#line 1118 "Printing.c"
 }
 
 
@@ -1131,7 +1126,7 @@ void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi) {
 	_tmp0_ = content_ppi;
 #line 137 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_ppi = _tmp0_;
-#line 1135 "Printing.c"
+#line 1130 "Printing.c"
 }
 
 
@@ -1143,7 +1138,7 @@ void print_settings_set_image_per_page_selection (PrintSettings* self, gint imag
 	_tmp0_ = image_per_page_selection;
 #line 141 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->image_per_page_selection = _tmp0_;
-#line 1147 "Printing.c"
+#line 1142 "Printing.c"
 }
 
 
@@ -1155,7 +1150,7 @@ void print_settings_set_size_selection (PrintSettings* self, gint size_selection
 	_tmp0_ = size_selection;
 #line 145 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->size_selection = _tmp0_;
-#line 1159 "Printing.c"
+#line 1154 "Printing.c"
 }
 
 
@@ -1167,7 +1162,7 @@ void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolea
 	_tmp0_ = enable_state;
 #line 149 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->match_aspect_ratio = _tmp0_;
-#line 1171 "Printing.c"
+#line 1166 "Printing.c"
 }
 
 
@@ -1179,7 +1174,7 @@ void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean prin
 	_tmp0_ = print_titles;
 #line 153 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->print_titles = _tmp0_;
-#line 1183 "Printing.c"
+#line 1178 "Printing.c"
 }
 
 
@@ -1198,7 +1193,7 @@ void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fon
 	_g_free0 (self->priv->print_titles_font);
 #line 157 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->print_titles_font = _tmp1_;
-#line 1202 "Printing.c"
+#line 1197 "Printing.c"
 }
 
 
@@ -1216,14 +1211,14 @@ gchar* print_settings_get_print_titles_font (PrintSettings* self) {
 	result = _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1220 "Printing.c"
+#line 1215 "Printing.c"
 }
 
 
 static void value_print_settings_init (GValue* value) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1227 "Printing.c"
+#line 1222 "Printing.c"
 }
 
 
@@ -1232,7 +1227,7 @@ static void value_print_settings_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (value->data[0].v_pointer);
-#line 1236 "Printing.c"
+#line 1231 "Printing.c"
 	}
 }
 
@@ -1242,11 +1237,11 @@ static void value_print_settings_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = print_settings_ref (src_value->data[0].v_pointer);
-#line 1246 "Printing.c"
+#line 1241 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1250 "Printing.c"
+#line 1245 "Printing.c"
 	}
 }
 
@@ -1254,37 +1249,37 @@ static void value_print_settings_copy_value (const GValue* src_value, GValue* de
 static gpointer value_print_settings_peek_pointer (const GValue* value) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 1258 "Printing.c"
+#line 1253 "Printing.c"
 }
 
 
 static gchar* value_print_settings_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1265 "Printing.c"
+#line 1260 "Printing.c"
 		PrintSettings* object;
 		object = collect_values[0].v_pointer;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1272 "Printing.c"
+#line 1267 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1276 "Printing.c"
+#line 1271 "Printing.c"
 		}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = print_settings_ref (object);
-#line 1280 "Printing.c"
+#line 1275 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1284 "Printing.c"
+#line 1279 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 1288 "Printing.c"
+#line 1283 "Printing.c"
 }
 
 
@@ -1295,25 +1290,25 @@ static gchar* value_print_settings_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1299 "Printing.c"
+#line 1294 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 1305 "Printing.c"
+#line 1300 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1309 "Printing.c"
+#line 1304 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = print_settings_ref (value->data[0].v_pointer);
-#line 1313 "Printing.c"
+#line 1308 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 1317 "Printing.c"
+#line 1312 "Printing.c"
 }
 
 
@@ -1327,7 +1322,7 @@ GParamSpec* param_spec_print_settings (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1331 "Printing.c"
+#line 1326 "Printing.c"
 }
 
 
@@ -1336,7 +1331,7 @@ gpointer value_get_print_settings (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS), NULL);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 1340 "Printing.c"
+#line 1335 "Printing.c"
 }
 
 
@@ -1356,17 +1351,17 @@ void value_set_print_settings (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_ref (value->data[0].v_pointer);
-#line 1360 "Printing.c"
+#line 1355 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1364 "Printing.c"
+#line 1359 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (old);
-#line 1370 "Printing.c"
+#line 1365 "Printing.c"
 	}
 }
 
@@ -1385,17 +1380,17 @@ void value_take_print_settings (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1389 "Printing.c"
+#line 1384 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1393 "Printing.c"
+#line 1388 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (old);
-#line 1399 "Printing.c"
+#line 1394 "Printing.c"
 	}
 }
 
@@ -1407,7 +1402,7 @@ static void print_settings_class_init (PrintSettingsClass * klass) {
 	((PrintSettingsClass *) klass)->finalize = print_settings_finalize;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintSettingsPrivate));
-#line 1411 "Printing.c"
+#line 1406 "Printing.c"
 }
 
 
@@ -1416,7 +1411,7 @@ static void print_settings_instance_init (PrintSettings * self) {
 	self->priv = PRINT_SETTINGS_GET_PRIVATE (self);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 1420 "Printing.c"
+#line 1415 "Printing.c"
 }
 
 
@@ -1428,7 +1423,7 @@ static void print_settings_finalize (PrintSettings* obj) {
 	g_signal_handlers_destroy (self);
 #line 28 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->priv->print_titles_font);
-#line 1432 "Printing.c"
+#line 1427 "Printing.c"
 }
 
 
@@ -1453,7 +1448,7 @@ gpointer print_settings_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 1457 "Printing.c"
+#line 1452 "Printing.c"
 }
 
 
@@ -1466,7 +1461,7 @@ void print_settings_unref (gpointer instance) {
 		PRINT_SETTINGS_GET_CLASS (self)->finalize (self);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1470 "Printing.c"
+#line 1465 "Printing.c"
 	}
 }
 
@@ -1496,7 +1491,7 @@ void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit) {
 	_tmp1_ = unit;
 #line 187 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*self).unit = _tmp1_;
-#line 1500 "Printing.c"
+#line 1495 "Printing.c"
 }
 
 
@@ -1514,13 +1509,13 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 		*result = (*self);
 #line 192 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 1518 "Printing.c"
+#line 1513 "Printing.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = to_unit;
 #line 194 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == MEASUREMENT_UNIT_INCHES) {
-#line 1524 "Printing.c"
+#line 1519 "Printing.c"
 		gdouble _tmp3_ = 0.0;
 		Measurement _tmp4_ = {0};
 #line 195 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1531,14 +1526,14 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 		*result = _tmp4_;
 #line 195 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 1535 "Printing.c"
+#line 1530 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == MEASUREMENT_UNIT_CENTIMETERS) {
-#line 1542 "Printing.c"
+#line 1537 "Printing.c"
 			gdouble _tmp6_ = 0.0;
 			Measurement _tmp7_ = {0};
 #line 197 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1549,11 +1544,11 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 			*result = _tmp7_;
 #line 197 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 1553 "Printing.c"
+#line 1548 "Printing.c"
 		} else {
 #line 199 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:199: unrecognized unit");
-#line 1557 "Printing.c"
+#line 1552 "Printing.c"
 		}
 	}
 }
@@ -1579,13 +1574,13 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 	_tmp3_ = _tmp2_.unit;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 1583 "Printing.c"
+#line 1578 "Printing.c"
 		Measurement _tmp4_ = {0};
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 1589 "Printing.c"
+#line 1584 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -1595,7 +1590,7 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 		measurement_convert_to (rhs, _tmp5_, &_tmp6_);
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 1599 "Printing.c"
+#line 1594 "Printing.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_rhs = _tmp0_;
@@ -1609,7 +1604,7 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 	result = _tmp7_ < _tmp9_;
 #line 205 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1613 "Printing.c"
+#line 1608 "Printing.c"
 }
 
 
@@ -1633,13 +1628,13 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 	_tmp3_ = _tmp2_.unit;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 1637 "Printing.c"
+#line 1632 "Printing.c"
 		Measurement _tmp4_ = {0};
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 1643 "Printing.c"
+#line 1638 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -1649,7 +1644,7 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 		measurement_convert_to (rhs, _tmp5_, &_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 1653 "Printing.c"
+#line 1648 "Printing.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_rhs = _tmp0_;
@@ -1663,7 +1658,7 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 	result = _tmp7_ > _tmp9_;
 #line 210 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1667 "Printing.c"
+#line 1662 "Printing.c"
 }
 
 
@@ -1675,14 +1670,14 @@ Measurement* measurement_dup (const Measurement* self) {
 	memcpy (dup, self, sizeof (Measurement));
 #line 178 "/home/jens/Source/shotwell/src/Printing.vala"
 	return dup;
-#line 1679 "Printing.c"
+#line 1674 "Printing.c"
 }
 
 
 void measurement_free (Measurement* self) {
 #line 178 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_free (self);
-#line 1686 "Printing.c"
+#line 1681 "Printing.c"
 }
 
 
@@ -1726,13 +1721,13 @@ PrintLayout* print_layout_get_all (int* result_length1) {
 	if (result_length1) {
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 		*result_length1 = _tmp1__length1;
-#line 1730 "Printing.c"
+#line 1725 "Printing.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1736 "Printing.c"
+#line 1731 "Printing.c"
 }
 
 
@@ -1773,7 +1768,7 @@ gint print_layout_get_per_page (PrintLayout self) {
 	per_page = (g_free (per_page), NULL);
 #line 238 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1777 "Printing.c"
+#line 1772 "Printing.c"
 }
 
 
@@ -1814,7 +1809,7 @@ gint print_layout_get_x (PrintLayout self) {
 	x = (g_free (x), NULL);
 #line 244 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1818 "Printing.c"
+#line 1813 "Printing.c"
 }
 
 
@@ -1855,7 +1850,7 @@ gint print_layout_get_y (PrintLayout self) {
 	y = (g_free (y), NULL);
 #line 250 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1859 "Printing.c"
+#line 1854 "Printing.c"
 }
 
 
@@ -1941,7 +1936,7 @@ gchar* print_layout_to_string (PrintLayout self) {
 	labels = (_vala_array_free (labels, labels_length1, (GDestroyNotify) g_free), NULL);
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1945 "Printing.c"
+#line 1940 "Printing.c"
 }
 
 
@@ -1958,87 +1953,87 @@ GType print_layout_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1964 "Printing.c"
+#line 1959 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_radio_group_click ((CustomPrintTab*) self, _sender);
-#line 1971 "Printing.c"
+#line 1966 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_standard_sizes_combo_separator_func (model, iter);
-#line 329 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1980 "Printing.c"
+#line 1975 "Printing.c"
 }
 
 
 static gpointer _standard_print_size_ref0 (gpointer self) {
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? standard_print_size_ref (self) : NULL;
-#line 1987 "Printing.c"
+#line 1982 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 340 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 1994 "Printing.c"
+#line 1989 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_width_entry_focus_out ((CustomPrintTab*) self, event);
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 324 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2003 "Printing.c"
+#line 1998 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_height_entry_focus_out ((CustomPrintTab*) self, event);
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 327 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2012 "Printing.c"
+#line 2007 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 329 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_units_combo_changed ((CustomPrintTab*) self);
-#line 2019 "Printing.c"
+#line 2014 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_ppi_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 2026 "Printing.c"
+#line 2021 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_ppi_entry_focus_out ((CustomPrintTab*) self, event);
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2035 "Printing.c"
+#line 2030 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 340 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_aspect_ratio_check_clicked ((CustomPrintTab*) self);
-#line 2042 "Printing.c"
+#line 2037 "Printing.c"
 }
 
 
@@ -2046,548 +2041,242 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 	CustomPrintTab * self = NULL;
 	PrintJob* _tmp0_ = NULL;
 	PrintJob* _tmp1_ = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GObject* _tmp7_ = NULL;
-	GtkRadioButton* _tmp8_ = NULL;
-	GtkRadioButton* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkRadioButton* _tmp12_ = NULL;
-	GtkRadioButton* _tmp13_ = NULL;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkRadioButton* _tmp16_ = NULL;
-	GtkRadioButton* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkComboBox* _tmp20_ = NULL;
-	GtkCellRendererText* image_per_page_combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp21_ = NULL;
-	GtkComboBox* _tmp22_ = NULL;
-	GtkCellRendererText* _tmp23_ = NULL;
-	GtkComboBox* _tmp24_ = NULL;
-	GtkCellRendererText* _tmp25_ = NULL;
-	GtkListStore* image_per_page_combo_store = NULL;
-	GtkListStore* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	PrintLayout* _tmp28_ = NULL;
-	GtkComboBox* _tmp36_ = NULL;
-	GtkListStore* _tmp37_ = NULL;
+	GtkRadioButton* _tmp2_ = NULL;
+	GtkRadioButton* _tmp3_ = NULL;
+	GtkRadioButton* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	PrintLayout* _tmp6_ = NULL;
 	StandardPrintSize** standard_sizes = NULL;
-	PrintManager* _tmp38_ = NULL;
-	PrintManager* _tmp39_ = NULL;
-	gint _tmp40_ = 0;
-	StandardPrintSize** _tmp41_ = NULL;
-	StandardPrintSize** _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
+	PrintManager* _tmp11_ = NULL;
+	PrintManager* _tmp12_ = NULL;
+	gint _tmp13_ = 0;
+	StandardPrintSize** _tmp14_ = NULL;
+	StandardPrintSize** _tmp15_ = NULL;
+	gint _tmp15__length1 = 0;
 	gint standard_sizes_length1 = 0;
 	gint _standard_sizes_size_ = 0;
-	GtkBuilder* _tmp43_ = NULL;
-	GObject* _tmp44_ = NULL;
-	GtkComboBox* _tmp45_ = NULL;
-	GtkCellRendererText* standard_sizes_combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp46_ = NULL;
-	GtkComboBox* _tmp47_ = NULL;
-	GtkCellRendererText* _tmp48_ = NULL;
-	GtkComboBox* _tmp49_ = NULL;
-	GtkCellRendererText* _tmp50_ = NULL;
-	GtkComboBox* _tmp51_ = NULL;
-	GtkListStore* standard_sizes_combo_store = NULL;
-	GtkListStore* _tmp52_ = NULL;
-	StandardPrintSize** _tmp53_ = NULL;
-	gint _tmp53__length1 = 0;
-	GtkComboBox* _tmp62_ = NULL;
-	GtkListStore* _tmp63_ = NULL;
-	GtkBuilder* _tmp64_ = NULL;
-	GObject* _tmp65_ = NULL;
-	GtkEntry* _tmp66_ = NULL;
-	GtkEntry* _tmp67_ = NULL;
-	GtkEntry* _tmp68_ = NULL;
-	GtkBuilder* _tmp69_ = NULL;
-	GObject* _tmp70_ = NULL;
-	GtkEntry* _tmp71_ = NULL;
-	GtkEntry* _tmp72_ = NULL;
-	GtkEntry* _tmp73_ = NULL;
-	GtkBuilder* _tmp74_ = NULL;
-	GObject* _tmp75_ = NULL;
-	GtkComboBoxText* _tmp76_ = NULL;
-	GtkComboBoxText* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	GtkComboBoxText* _tmp79_ = NULL;
-	const gchar* _tmp80_ = NULL;
-	GtkComboBoxText* _tmp81_ = NULL;
-	GtkComboBoxText* _tmp82_ = NULL;
-	GtkBuilder* _tmp83_ = NULL;
-	GObject* _tmp84_ = NULL;
-	GtkCheckButton* _tmp85_ = NULL;
-	GtkBuilder* _tmp86_ = NULL;
-	GObject* _tmp87_ = NULL;
-	GtkCheckButton* _tmp88_ = NULL;
-	GtkBuilder* _tmp89_ = NULL;
-	GObject* _tmp90_ = NULL;
-	GtkFontButton* _tmp91_ = NULL;
-	GtkBuilder* _tmp92_ = NULL;
-	GObject* _tmp93_ = NULL;
-	GtkEntry* _tmp94_ = NULL;
-	GtkEntry* _tmp95_ = NULL;
-	GtkEntry* _tmp96_ = NULL;
-	GtkBox* _tmp97_ = NULL;
-	PrintJob* _tmp98_ = NULL;
-	GtkCheckButton* _tmp99_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+	GtkComboBoxText* _tmp16_ = NULL;
+	StandardPrintSize** _tmp17_ = NULL;
+	gint _tmp17__length1 = 0;
+	GtkComboBoxText* _tmp22_ = NULL;
+	ResourcesUnitSystem _tmp23_ = 0;
+	GtkEntry* _tmp24_ = NULL;
+	GtkEntry* _tmp25_ = NULL;
+	GtkEntry* _tmp26_ = NULL;
+	GtkEntry* _tmp27_ = NULL;
+	GtkComboBoxText* _tmp28_ = NULL;
+	GtkComboBoxText* _tmp29_ = NULL;
+	ResourcesUnitSystem _tmp30_ = 0;
+	GtkEntry* _tmp31_ = NULL;
+	GtkEntry* _tmp32_ = NULL;
+	PrintJob* _tmp33_ = NULL;
+	GtkCheckButton* _tmp34_ = NULL;
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (source_job), NULL);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (CustomPrintTab*) g_object_new (object_type, NULL);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = source_job;
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->source_job);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->source_job = _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 293 "/home/jens/Source/shotwell/src/Printing.vala"
-	builder = _tmp2_;
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = builder;
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = gtk_builder_get_object (_tmp3_, "box_ImgSettingsPane");
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_box_get_type ()) ? ((GtkBox*) _tmp4_) : NULL);
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_image_settings_pane);
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_image_settings_pane = _tmp5_;
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = builder;
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = gtk_builder_get_object (_tmp6_, "radio_UseStandardSize");
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp7_) : NULL);
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_size_radio);
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_size_radio = _tmp8_;
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp9_ = self->priv->standard_size_radio;
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = builder;
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "radio_UseCustomSize");
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp11_) : NULL);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_size_radio);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_size_radio = _tmp12_;
-#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp13_ = self->priv->custom_size_radio;
-#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_ = builder;
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "radio_Autosize");
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp15_) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->image_per_page_radio);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_radio = _tmp16_;
 #line 305 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp17_ = self->priv->image_per_page_radio;
+	_g_object_unref0 (self->priv->source_job);
 #line 305 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp18_ = builder;
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "combo_Autosize");
+	self->priv->source_job = _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp19_) : NULL);
+	_tmp2_ = self->priv->standard_size_radio;
 #line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->image_per_page_combo);
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_combo = _tmp20_;
-#line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_object_ref_sink (_tmp21_);
+	_tmp3_ = self->priv->custom_size_radio;
 #line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	image_per_page_combo_text_renderer = _tmp21_;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp22_ = self->priv->image_per_page_combo;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp23_ = image_per_page_combo_text_renderer;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp24_ = self->priv->image_per_page_combo;
-#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp25_ = image_per_page_combo_text_renderer;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
+#line 309 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp4_ = self->priv->image_per_page_radio;
+#line 309 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 313 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 313 "/home/jens/Source/shotwell/src/Printing.vala"
-	image_per_page_combo_store = _tmp26_;
-#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp28_ = print_layout_get_all (&_tmp27_);
-#line 2245 "Printing.c"
+	_tmp6_ = print_layout_get_all (&_tmp5_);
+#line 2101 "Printing.c"
 	{
 		PrintLayout* layout_collection = NULL;
 		gint layout_collection_length1 = 0;
 		gint _layout_collection_size_ = 0;
 		gint layout_it = 0;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection = _tmp6_;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection_length1 = _tmp5_;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		for (layout_it = 0; layout_it < _tmp5_; layout_it = layout_it + 1) {
+#line 2113 "Printing.c"
+			PrintLayout layout = 0;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+			layout = layout_collection[layout_it];
+#line 2117 "Printing.c"
+			{
+				GtkComboBoxText* _tmp7_ = NULL;
+				PrintLayout _tmp8_ = 0;
+				gchar* _tmp9_ = NULL;
+				gchar* _tmp10_ = NULL;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp7_ = self->priv->image_per_page_combo;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp8_ = layout;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp9_ = print_layout_to_string (_tmp8_);
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp10_ = _tmp9_;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				gtk_combo_box_text_append_text (_tmp7_, _tmp10_);
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_free0 (_tmp10_);
+#line 2135 "Printing.c"
+			}
+		}
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection = (g_free (layout_collection), NULL);
+#line 2140 "Printing.c"
+	}
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection = _tmp28_;
+	_tmp11_ = print_manager_get_instance ();
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection_length1 = _tmp27_;
+	_tmp12_ = _tmp11_;
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		for (layout_it = 0; layout_it < _tmp27_; layout_it = layout_it + 1) {
-#line 2257 "Printing.c"
-			PrintLayout layout = 0;
+	_tmp14_ = print_manager_get_standard_sizes (_tmp12_, &_tmp13_);
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-			layout = layout_collection[layout_it];
-#line 2261 "Printing.c"
-			{
-				GtkTreeIter iter = {0};
-				GtkListStore* _tmp29_ = NULL;
-				GtkTreeIter _tmp30_ = {0};
-				GtkListStore* _tmp31_ = NULL;
-				GtkTreeIter _tmp32_ = {0};
-				PrintLayout _tmp33_ = 0;
-				gchar* _tmp34_ = NULL;
-				GValue _tmp35_ = {0};
+	_tmp15_ = _tmp14_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp15__length1 = _tmp13_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_print_manager_unref0 (_tmp12_);
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	standard_sizes = _tmp15_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	standard_sizes_length1 = _tmp15__length1;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_standard_sizes_size_ = standard_sizes_length1;
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp16_ = self->priv->standard_sizes_combo;
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_row_separator_func (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp17_ = standard_sizes;
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp17__length1 = standard_sizes_length1;
+#line 2168 "Printing.c"
+	{
+		StandardPrintSize** size_collection = NULL;
+		gint size_collection_length1 = 0;
+		gint _size_collection_size_ = 0;
+		gint size_it = 0;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp29_ = image_per_page_combo_store;
+		size_collection = _tmp17_;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_append (_tmp29_, &_tmp30_);
+		size_collection_length1 = _tmp17__length1;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				iter = _tmp30_;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp31_ = image_per_page_combo_store;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp32_ = iter;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp33_ = layout;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp34_ = print_layout_to_string (_tmp33_);
+		for (size_it = 0; size_it < _tmp17__length1; size_it = size_it + 1) {
+#line 2180 "Printing.c"
+			StandardPrintSize* _tmp18_ = NULL;
+			StandardPrintSize* size = NULL;
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp18_ = _standard_print_size_ref0 (size_collection[size_it]);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+			size = _tmp18_;
+#line 2187 "Printing.c"
+			{
+				GtkComboBoxText* _tmp19_ = NULL;
+				StandardPrintSize* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_init (&_tmp35_, G_TYPE_STRING);
+				_tmp19_ = self->priv->standard_sizes_combo;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_take_string (&_tmp35_, _tmp34_);
+				_tmp20_ = size;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_set_value (_tmp31_, &_tmp32_, 0, &_tmp35_);
+				_tmp21_ = _tmp20_->name;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				G_IS_VALUE (&_tmp35_) ? (g_value_unset (&_tmp35_), NULL) : NULL;
-#line 2293 "Printing.c"
+				gtk_combo_box_text_append_text (_tmp19_, _tmp21_);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+				_standard_print_size_unref0 (size);
+#line 2202 "Printing.c"
 			}
 		}
-#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection = (g_free (layout_collection), NULL);
-#line 2298 "Printing.c"
 	}
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36_ = self->priv->image_per_page_combo;
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp37_ = image_per_page_combo_store;
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_model (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp38_ = print_manager_get_instance ();
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp39_ = _tmp38_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp41_ = print_manager_get_standard_sizes (_tmp39_, &_tmp40_);
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp42_ = _tmp41_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp42__length1 = _tmp40_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_print_manager_unref0 (_tmp39_);
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes = _tmp42_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_length1 = _tmp42__length1;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_standard_sizes_size_ = standard_sizes_length1;
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp43_ = builder;
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp22_ = self->priv->standard_sizes_combo;
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp23_ = resources_get_default_measurement_unit ();
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), 9 * _tmp23_);
 #line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp44_ = gtk_builder_get_object (_tmp43_, "combo_StdSizes");
+	_tmp24_ = self->priv->custom_width_entry;
 #line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp44_) : NULL);
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_sizes_combo);
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_sizes_combo = _tmp45_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
 #line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp46_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp25_ = self->priv->custom_width_entry;
 #line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_object_ref_sink (_tmp46_);
-#line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_combo_text_renderer = _tmp46_;
-#line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp47_ = self->priv->standard_sizes_combo;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp48_ = standard_sizes_combo_text_renderer;
+	_tmp26_ = self->priv->custom_height_entry;
 #line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
 #line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp49_ = self->priv->standard_sizes_combo;
+	_tmp27_ = self->priv->custom_height_entry;
 #line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50_ = standard_sizes_combo_text_renderer;
-#line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 329 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp51_ = self->priv->standard_sizes_combo;
+	_tmp28_ = self->priv->units_combo;
 #line 329 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_row_separator_func (_tmp51_, _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0);
 #line 330 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp52_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
+	_tmp29_ = self->priv->units_combo;
 #line 330 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_combo_store = _tmp52_;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp53_ = standard_sizes;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp53__length1 = standard_sizes_length1;
-#line 2364 "Printing.c"
-	{
-		StandardPrintSize** size_collection = NULL;
-		gint size_collection_length1 = 0;
-		gint _size_collection_size_ = 0;
-		gint size_it = 0;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		size_collection = _tmp53_;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		size_collection_length1 = _tmp53__length1;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		for (size_it = 0; size_it < _tmp53__length1; size_it = size_it + 1) {
-#line 2376 "Printing.c"
-			StandardPrintSize* _tmp54_ = NULL;
-			StandardPrintSize* size = NULL;
+	_tmp30_ = resources_get_default_measurement_unit ();
+#line 330 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp30_);
 #line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp54_ = _standard_print_size_ref0 (size_collection[size_it]);
+	_tmp31_ = self->priv->ppi_entry;
 #line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-			size = _tmp54_;
-#line 2383 "Printing.c"
-			{
-				GtkTreeIter iter = {0};
-				GtkListStore* _tmp55_ = NULL;
-				GtkTreeIter _tmp56_ = {0};
-				GtkListStore* _tmp57_ = NULL;
-				GtkTreeIter _tmp58_ = {0};
-				StandardPrintSize* _tmp59_ = NULL;
-				const gchar* _tmp60_ = NULL;
-				GValue _tmp61_ = {0};
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp55_ = standard_sizes_combo_store;
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_append (_tmp55_, &_tmp56_);
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				iter = _tmp56_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0);
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp32_ = self->priv->ppi_entry;
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp57_ = standard_sizes_combo_store;
+	_tmp33_ = source_job;
 #line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp58_ = iter;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp59_ = size;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp60_ = _tmp59_->name;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_init (&_tmp61_, G_TYPE_STRING);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_set_string (&_tmp61_, _tmp60_);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_set_value (_tmp57_, &_tmp58_, 0, &_tmp61_);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				G_IS_VALUE (&_tmp61_) ? (g_value_unset (&_tmp61_), NULL) : NULL;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-				_standard_print_size_unref0 (size);
-#line 2417 "Printing.c"
-			}
-		}
-	}
-#line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp62_ = self->priv->standard_sizes_combo;
-#line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp63_ = standard_sizes_combo_store;
+	custom_print_tab_sync_state_from_job (self, _tmp33_);
 #line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_model (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp64_ = builder;
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65_ = gtk_builder_get_object (_tmp64_, "entry_CustomWidth");
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp65_) : NULL);
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_width_entry);
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_width_entry = _tmp66_;
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 340 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp67_ = self->priv->custom_width_entry;
+	_tmp34_ = self->priv->aspect_ratio_check;
 #line 340 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp68_ = self->priv->custom_width_entry;
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp69_ = builder;
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70_ = gtk_builder_get_object (_tmp69_, "entry_CustomHeight");
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp70_) : NULL);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_height_entry);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_height_entry = _tmp71_;
-#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp72_ = self->priv->custom_height_entry;
-#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp73_ = self->priv->custom_height_entry;
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp74_ = builder;
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75_ = gtk_builder_get_object (_tmp74_, "combo_Units");
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp75_) : NULL);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->units_combo);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->units_combo = _tmp76_;
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp77_ = self->priv->units_combo;
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp78_ = _ ("in.");
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_text_append_text (_tmp77_, _tmp78_);
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp79_ = self->priv->units_combo;
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp80_ = _ ("cm");
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_text_append_text (_tmp79_, _tmp80_);
-#line 350 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp81_ = self->priv->units_combo;
-#line 350 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp82_ = self->priv->units_combo;
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp83_ = builder;
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp84_ = gtk_builder_get_object (_tmp83_, "check_MatchAspectRatio");
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp85_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp84_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp84_) : NULL);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->aspect_ratio_check);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->aspect_ratio_check = _tmp85_;
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp86_ = builder;
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp87_ = gtk_builder_get_object (_tmp86_, "check_PrintImageTitle");
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp88_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp87_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp87_) : NULL);
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->title_print_check);
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_check = _tmp88_;
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp89_ = builder;
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp90_ = gtk_builder_get_object (_tmp89_, "fntbn_TitleFont");
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_font_button_get_type ()) ? ((GtkFontButton*) _tmp90_) : NULL);
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->title_print_font);
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_font = _tmp91_;
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp92_ = builder;
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp93_ = gtk_builder_get_object (_tmp92_, "entry_PixelsPerInch");
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp94_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp93_) : NULL);
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->ppi_entry);
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->ppi_entry = _tmp94_;
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp95_ = self->priv->ppi_entry;
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp96_ = self->priv->ppi_entry;
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp97_ = self->priv->custom_image_settings_pane;
-#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget));
-#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp98_ = source_job;
-#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
-	custom_print_tab_sync_state_from_job (self, _tmp98_);
-#line 365 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp99_ = self->priv->aspect_ratio_check;
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (standard_sizes_combo_store);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (standard_sizes_combo_text_renderer);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes = (_vala_array_free (standard_sizes, standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (image_per_page_combo_store);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (image_per_page_combo_text_renderer);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (builder);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0);
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 2569 "Printing.c"
+#line 2258 "Printing.c"
 }
 
 
 CustomPrintTab* custom_print_tab_new (PrintJob* source_job) {
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return custom_print_tab_construct (TYPE_CUSTOM_PRINT_TAB, source_job);
-#line 2576 "Printing.c"
+#line 2265 "Printing.c"
 }
 
 
 static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_) {
-#line 2591 "Printing.c"
+#line 2280 "Printing.c"
 		Measurement _tmp2_ = {0};
 		gdouble _tmp3_ = 0.0;
 		PrintJob* _tmp4_ = NULL;
@@ -2598,33 +2287,33 @@ static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self
 		Measurement _tmp9_ = {0};
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->local_content_height;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = _tmp2_.value;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->source_job;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = print_job_get_source_aspect_ratio (_tmp4_);
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->local_content_height;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&self->priv->local_content_width, _tmp3_ * _tmp5_, _tmp7_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp8_ = self->priv->custom_width_entry;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->local_content_width;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = custom_print_tab_format_measurement (self, &_tmp9_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = _tmp10_;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp8_, _tmp11_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp11_);
-#line 2628 "Printing.c"
+#line 2317 "Printing.c"
 	}
 }
 
@@ -2661,116 +2350,116 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 	Measurement _tmp41_ = {0};
 	gchar* _tmp42_ = NULL;
 	gchar* _tmp43_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 352 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 352 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_width_entry;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_width;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp6_) {
-#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2691 "Printing.c"
+#line 2380 "Printing.c"
 	}
-#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_width_entry_value (self, &_tmp7_);
-#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_width = _tmp7_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = self->priv->source_job;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	min_width = _tmp12_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = self->priv->source_job;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = print_job_get_local_settings (_tmp13_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = _tmp14_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp15_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	max_width = _tmp17_;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = min_width;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = measurement_is_less_than (&new_width, &_tmp19_);
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp20_) {
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 2733 "Printing.c"
+#line 2422 "Printing.c"
 	} else {
 		Measurement _tmp21_ = {0};
 		gboolean _tmp22_ = FALSE;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_width;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_width, &_tmp21_);
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 2743 "Printing.c"
+#line 2432 "Printing.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 2747 "Printing.c"
+#line 2436 "Printing.c"
 		GtkEntry* _tmp23_ = NULL;
 		Measurement _tmp24_ = {0};
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_width_entry;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = self->priv->local_content_width;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_);
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = _tmp25_;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp23_, _tmp26_);
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp26_);
-#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2768 "Printing.c"
+#line 2457 "Printing.c"
 	}
-#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 2774 "Printing.c"
+#line 2463 "Printing.c"
 		Measurement new_height = {0};
 		Measurement _tmp28_ = {0};
 		gdouble _tmp29_ = 0.0;
@@ -2783,59 +2472,59 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 		Measurement _tmp36_ = {0};
 		gchar* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_width;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_.value;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->source_job;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = print_job_get_source_aspect_ratio (_tmp30_);
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = new_width;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = _tmp32_.unit;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&new_height, _tmp29_ / _tmp31_, _tmp33_);
-#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 370 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = new_height;
-#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 370 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_height = _tmp34_;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp35_ = self->priv->custom_height_entry;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp36_ = new_height;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_);
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = _tmp37_;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp35_, _tmp38_);
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 2817 "Printing.c"
+#line 2506 "Printing.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 374 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_width;
-#line 402 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 374 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_width = _tmp39_;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = self->priv->custom_width_entry;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = new_width;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_);
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp40_, _tmp43_);
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp43_);
-#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2839 "Printing.c"
+#line 2528 "Printing.c"
 }
 
 
@@ -2844,21 +2533,21 @@ static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measure
 	Measurement _tmp0_ = {0};
 	gdouble _tmp1_ = 0.0;
 	gchar* _tmp2_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 379 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 379 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (measurement != NULL, NULL);
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *measurement;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.value;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = g_strdup_printf ("%.2f", _tmp1_);
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2862 "Printing.c"
+#line 2551 "Printing.c"
 }
 
 
@@ -2871,47 +2560,47 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas
 	Measurement converted_measurement = {0};
 	Measurement _tmp7_ = {0};
 	gchar* _tmp8_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 411 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (measurement != NULL, NULL);
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = *measurement;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _tmp1_.unit;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = to_unit;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 2887 "Printing.c"
+#line 2576 "Printing.c"
 		Measurement _tmp4_ = {0};
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *measurement;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 2893 "Printing.c"
+#line 2582 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (measurement, _tmp5_, &_tmp6_);
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 2903 "Printing.c"
+#line 2592 "Printing.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_measurement = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = converted_measurement;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_format_measurement (self, &_tmp7_);
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp8_;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2915 "Printing.c"
+#line 2604 "Printing.c"
 }
 
 
@@ -2920,23 +2609,23 @@ static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, G
 	GtkEntry* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->ppi_entry;
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = atoi (_tmp1_);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_ppi (self, _tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2940 "Printing.c"
+#line 2629 "Printing.c"
 }
 
 
@@ -2954,7 +2643,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2958 "Printing.c"
+#line 2647 "Printing.c"
 }
 
 
@@ -2970,104 +2659,104 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	GtkEntry* _tmp31_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_EDITABLE (editable));
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (text != NULL);
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = editable;
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->is_text_insertion_in_progress;
-#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (sender);
-#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 2994 "Printing.c"
+#line 2683 "Printing.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 401 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
-#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = length;
-#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 3002 "Printing.c"
+#line 2691 "Printing.c"
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = strlen (_tmp4_);
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp5_;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 3014 "Printing.c"
+#line 2703 "Printing.c"
 	}
-#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = g_strdup ("");
-#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp7_;
-#line 3020 "Printing.c"
+#line 2709 "Printing.c"
 	{
 		gint ctr = 0;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 3025 "Printing.c"
+#line 2714 "Printing.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = TRUE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 3032 "Printing.c"
+#line 2721 "Printing.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
 				gboolean _tmp15_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp8_) {
-#line 3041 "Printing.c"
+#line 2730 "Printing.c"
 					gint _tmp9_ = 0;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp9_ = ctr;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp9_ + 1;
-#line 3047 "Printing.c"
+#line 2736 "Printing.c"
 				}
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp8_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp10_ = ctr;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp11_ = length;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 3059 "Printing.c"
+#line 2748 "Printing.c"
 				}
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp12_ = text;
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp13_ = ctr;
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp15_ = g_ascii_isdigit (_tmp14_);
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp15_) {
-#line 3071 "Printing.c"
+#line 2760 "Printing.c"
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
 					gint _tmp18_ = 0;
@@ -3075,70 +2764,70 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 					gchar* _tmp20_ = NULL;
 					gchar* _tmp21_ = NULL;
 					gchar* _tmp22_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp16_ = new_text;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp17_ = text;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp18_ = ctr;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp20_ = g_strdup_printf ("%c", (gchar) _tmp19_);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp21_ = _tmp20_;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp22_ = g_strconcat (_tmp16_, _tmp21_, NULL);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (new_text);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					new_text = _tmp22_;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp21_);
-#line 3099 "Printing.c"
+#line 2788 "Printing.c"
 				}
 			}
 		}
 	}
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp23_ = new_text;
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp24_ = strlen (_tmp23_);
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = _tmp24_;
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp25_ > 0) {
-#line 3112 "Printing.c"
+#line 2801 "Printing.c"
 		GtkEntry* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
 		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = sender;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = new_text;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_text;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = strlen (_tmp28_);
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = _tmp29_;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), _tmp27_, (gint) _tmp30_, position);
-#line 3130 "Printing.c"
+#line 2819 "Printing.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 415 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = sender;
-#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 415 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_stop_emission_by_name (_tmp31_, "insert-text");
-#line 445 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (new_text);
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3142 "Printing.c"
+#line 2831 "Printing.c"
 }
 
 
@@ -3174,116 +2863,116 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 	Measurement _tmp41_ = {0};
 	gchar* _tmp42_ = NULL;
 	gchar* _tmp43_ = NULL;
-#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 420 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 420 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_height;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp6_) {
-#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 423 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 423 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3204 "Printing.c"
+#line 2893 "Printing.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 425 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_height_entry_value (self, &_tmp7_);
-#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 425 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_height = _tmp7_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = self->priv->source_job;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	min_height = _tmp12_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = self->priv->source_job;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = print_job_get_local_settings (_tmp13_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = _tmp14_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp15_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	max_height = _tmp17_;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = min_height;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = measurement_is_less_than (&new_height, &_tmp19_);
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp20_) {
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 3246 "Printing.c"
+#line 2935 "Printing.c"
 	} else {
 		Measurement _tmp21_ = {0};
 		gboolean _tmp22_ = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_height;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_height, &_tmp21_);
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 3256 "Printing.c"
+#line 2945 "Printing.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 3260 "Printing.c"
+#line 2949 "Printing.c"
 		GtkEntry* _tmp23_ = NULL;
 		Measurement _tmp24_ = {0};
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_height_entry;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = self->priv->local_content_height;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_);
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = _tmp25_;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp23_, _tmp26_);
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp26_);
-#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3281 "Printing.c"
+#line 2970 "Printing.c"
 	}
-#line 462 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 462 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 3287 "Printing.c"
+#line 2976 "Printing.c"
 		Measurement new_width = {0};
 		Measurement _tmp28_ = {0};
 		gdouble _tmp29_ = 0.0;
@@ -3296,59 +2985,59 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 		Measurement _tmp36_ = {0};
 		gchar* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_height;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_.value;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->source_job;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = print_job_get_source_aspect_ratio (_tmp30_);
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = new_height;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = _tmp32_.unit;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&new_width, _tmp29_ * _tmp31_, _tmp33_);
-#line 466 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 438 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = new_width;
-#line 466 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 438 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_width = _tmp34_;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp35_ = self->priv->custom_width_entry;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp36_ = new_width;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_);
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = _tmp37_;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp35_, _tmp38_);
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 3330 "Printing.c"
+#line 3019 "Printing.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 442 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_height;
-#line 470 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 442 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_height = _tmp39_;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = self->priv->custom_height_entry;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = new_height;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_);
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp40_, _tmp43_);
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp43_);
-#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 444 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 444 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 3352 "Printing.c"
+#line 3041 "Printing.c"
 }
 
 
@@ -3356,37 +3045,37 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 	MeasurementUnit result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 447 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->units_combo;
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE) {
-#line 477 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = MEASUREMENT_UNIT_INCHES;
-#line 477 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3372 "Printing.c"
+#line 3061 "Printing.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->units_combo;
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp3_ == CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE) {
-#line 479 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
 			result = MEASUREMENT_UNIT_CENTIMETERS;
-#line 479 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
 			return result;
-#line 3386 "Printing.c"
+#line 3075 "Printing.c"
 		} else {
-#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:481: unknown unit combo box choice");
-#line 3390 "Printing.c"
+#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:453: unknown unit combo box choice");
+#line 3079 "Printing.c"
 		}
 	}
 }
@@ -3394,36 +3083,36 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 
 static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, MeasurementUnit unit) {
 	MeasurementUnit _tmp0_ = 0;
-#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = unit;
-#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == MEASUREMENT_UNIT_INCHES) {
-#line 3404 "Printing.c"
+#line 3093 "Printing.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = self->priv->units_combo;
-#line 487 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE);
-#line 3410 "Printing.c"
+#line 3099 "Printing.c"
 	} else {
 		MeasurementUnit _tmp2_ = 0;
-#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = unit;
-#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp2_ == MEASUREMENT_UNIT_CENTIMETERS) {
-#line 3417 "Printing.c"
+#line 3106 "Printing.c"
 			GtkComboBoxText* _tmp3_ = NULL;
-#line 489 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->units_combo;
-#line 489 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE);
-#line 3423 "Printing.c"
+#line 3112 "Printing.c"
 		} else {
-#line 491 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:491: unknown MeasurementUnit enumeration");
-#line 3427 "Printing.c"
+#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:463: unknown MeasurementUnit enumeration");
+#line 3116 "Printing.c"
 		}
 	}
 }
@@ -3443,7 +3132,7 @@ static gdouble double_parse (const gchar* str) {
 	result = _tmp1_;
 #line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3447 "Printing.c"
+#line 3136 "Printing.c"
 }
 
 
@@ -3453,23 +3142,23 @@ static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measur
 	gdouble _tmp2_ = 0.0;
 	MeasurementUnit _tmp3_ = 0;
 	Measurement _tmp4_ = {0};
-#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_width_entry;
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = double_parse (_tmp1_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&_tmp4_, _tmp2_, _tmp3_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp4_;
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3473 "Printing.c"
+#line 3162 "Printing.c"
 }
 
 
@@ -3479,23 +3168,23 @@ static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measu
 	gdouble _tmp2_ = 0.0;
 	MeasurementUnit _tmp3_ = 0;
 	Measurement _tmp4_ = {0};
-#line 499 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = double_parse (_tmp1_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&_tmp4_, _tmp2_, _tmp3_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp4_;
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3499 "Printing.c"
+#line 3188 "Printing.c"
 }
 
 
@@ -3515,7 +3204,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3519 "Printing.c"
+#line 3208 "Printing.c"
 }
 
 
@@ -3538,118 +3227,118 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	gint _tmp43_ = 0;
 	gint _tmp44_ = 0;
 	GtkEntry* _tmp50_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_EDITABLE (editable));
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (text != NULL);
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = editable;
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 508 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 480 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->is_text_insertion_in_progress;
-#line 508 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 480 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (sender);
-#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 3562 "Printing.c"
+#line 3251 "Printing.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 483 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
-#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = length;
-#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 3570 "Printing.c"
+#line 3259 "Printing.c"
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = strlen (_tmp4_);
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp5_;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 3582 "Printing.c"
+#line 3271 "Printing.c"
 	}
-#line 516 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = nl_langinfo (RADIXCHAR);
-#line 516 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
 	decimal_point = _tmp7_;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = sender;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = decimal_point;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = string_contains (_tmp9_, _tmp10_);
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	contains_decimal_point = _tmp11_;
-#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 492 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = g_strdup ("");
-#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 492 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp12_;
-#line 3602 "Printing.c"
+#line 3291 "Printing.c"
 	{
 		gint ctr = 0;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 3607 "Printing.c"
+#line 3296 "Printing.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = TRUE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 3614 "Printing.c"
+#line 3303 "Printing.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				const gchar* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
 				gchar _tmp19_ = '\0';
 				gboolean _tmp20_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp13_) {
-#line 3623 "Printing.c"
+#line 3312 "Printing.c"
 					gint _tmp14_ = 0;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp14_ = ctr;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp14_ + 1;
-#line 3629 "Printing.c"
+#line 3318 "Printing.c"
 				}
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp13_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp15_ = ctr;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp16_ = length;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 3641 "Printing.c"
+#line 3330 "Printing.c"
 				}
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp17_ = text;
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp18_ = ctr;
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp20_ = g_ascii_isdigit (_tmp19_);
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp20_) {
-#line 3653 "Printing.c"
+#line 3342 "Printing.c"
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					gint _tmp23_ = 0;
@@ -3657,61 +3346,61 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 					gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
 					gchar* _tmp27_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp21_ = new_text;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp22_ = text;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp23_ = ctr;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp24_ = string_get (_tmp22_, (glong) _tmp23_);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp25_ = g_strdup_printf ("%c", (gchar) _tmp24_);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp26_ = _tmp25_;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp27_ = g_strconcat (_tmp21_, _tmp26_, NULL);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (new_text);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					new_text = _tmp27_;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp26_);
-#line 3681 "Printing.c"
+#line 3370 "Printing.c"
 				} else {
 					gboolean _tmp28_ = FALSE;
 					gboolean _tmp29_ = FALSE;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp29_ = contains_decimal_point;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (!_tmp29_) {
-#line 3689 "Printing.c"
+#line 3378 "Printing.c"
 						const gchar* _tmp30_ = NULL;
 						gint _tmp31_ = 0;
 						gchar _tmp32_ = '\0';
 						const gchar* _tmp33_ = NULL;
 						gchar _tmp34_ = '\0';
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp30_ = text;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp31_ = ctr;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp33_ = decimal_point;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp34_ = string_get (_tmp33_, (glong) 0);
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = _tmp32_ == _tmp34_;
-#line 3707 "Printing.c"
+#line 3396 "Printing.c"
 					} else {
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = FALSE;
-#line 3711 "Printing.c"
+#line 3400 "Printing.c"
 					}
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (_tmp28_) {
-#line 3715 "Printing.c"
+#line 3404 "Printing.c"
 						const gchar* _tmp35_ = NULL;
 						const gchar* _tmp36_ = NULL;
 						gint _tmp37_ = 0;
@@ -3719,71 +3408,71 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 						gchar* _tmp39_ = NULL;
 						gchar* _tmp40_ = NULL;
 						gchar* _tmp41_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp35_ = new_text;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp36_ = text;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp37_ = ctr;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp38_ = string_get (_tmp36_, (glong) _tmp37_);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp39_ = g_strdup_printf ("%c", (gchar) _tmp38_);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp40_ = _tmp39_;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp41_ = g_strconcat (_tmp35_, _tmp40_, NULL);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_g_free0 (new_text);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						new_text = _tmp41_;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_g_free0 (_tmp40_);
-#line 3743 "Printing.c"
+#line 3432 "Printing.c"
 					}
 				}
 			}
 		}
 	}
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = new_text;
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = strlen (_tmp42_);
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp44_ = _tmp43_;
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp44_ > 0) {
-#line 3757 "Printing.c"
+#line 3446 "Printing.c"
 		GtkEntry* _tmp45_ = NULL;
 		const gchar* _tmp46_ = NULL;
 		const gchar* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		gint _tmp49_ = 0;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = sender;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp46_ = new_text;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp47_ = new_text;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp48_ = strlen (_tmp47_);
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp49_ = _tmp48_;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_EDITABLE, GtkEditable), _tmp46_, (gint) _tmp49_, position);
-#line 3775 "Printing.c"
+#line 3464 "Printing.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 504 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = sender;
-#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 504 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_stop_emission_by_name (_tmp50_, "insert-text");
-#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (new_text);
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3787 "Printing.c"
+#line 3476 "Printing.c"
 }
 
 
@@ -3843,65 +3532,65 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 	PrintSettings* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
 	gchar* _tmp65_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_job_get_local_settings (_tmp0_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _tmp1_;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_width (_tmp2_, &_tmp3_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_.unit;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = job;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = print_job_get_local_settings (_tmp5_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = _tmp6_;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_height (_tmp7_, &_tmp8_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_.unit;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_vala_assert (_tmp4_ == _tmp9_, "job.get_local_settings().get_content_width().unit ==             job.get_local_settings().get_content_height().unit");
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp7_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp2_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = job;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_job_get_local_settings (_tmp10_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_width (_tmp12_, &_tmp13_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = _tmp13_;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp12_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	constrained_width = _tmp14_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = job;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = print_job_get_local_settings (_tmp15_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = print_settings_is_match_aspect_ratio_enabled (_tmp17_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = _tmp18_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp17_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp19_) {
-#line 3905 "Printing.c"
+#line 3594 "Printing.c"
 		PrintJob* _tmp20_ = NULL;
 		PrintSettings* _tmp21_ = NULL;
 		PrintSettings* _tmp22_ = NULL;
@@ -3914,143 +3603,143 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 		PrintSettings* _tmp29_ = NULL;
 		Measurement _tmp30_ = {0};
 		MeasurementUnit _tmp31_ = 0;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp20_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = print_job_get_local_settings (_tmp20_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = _tmp21_;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_get_content_height (_tmp22_, &_tmp23_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = _tmp23_.value;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = print_job_get_source_aspect_ratio (_tmp25_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = print_job_get_local_settings (_tmp27_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_get_content_height (_tmp29_, &_tmp30_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = _tmp30_.unit;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&constrained_width, _tmp24_ * _tmp26_, _tmp31_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp29_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp22_);
-#line 3948 "Printing.c"
+#line 3637 "Printing.c"
 	}
-#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 517 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = constrained_width;
-#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 517 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_width (self, &_tmp32_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = job;
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp34_ = print_job_get_local_settings (_tmp33_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp35_ = _tmp34_;
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_height (_tmp35_, &_tmp36_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_height (self, &_tmp36_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp35_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp37_ = job;
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp38_ = print_job_get_local_settings (_tmp37_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = _tmp38_;
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = print_settings_get_content_layout (_tmp39_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_layout (self, _tmp40_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp39_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = job;
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = print_job_get_local_settings (_tmp41_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp44_ = print_settings_get_content_ppi (_tmp43_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_ppi (self, _tmp44_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp43_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp45_ = job;
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp46_ = print_job_get_local_settings (_tmp45_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp47_ = _tmp46_;
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp48_ = print_settings_get_image_per_page_selection (_tmp47_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_image_per_page_selection (self, _tmp48_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp47_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp49_ = job;
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = print_job_get_local_settings (_tmp49_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp51_ = _tmp50_;
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp52_ = print_settings_get_size_selection (_tmp51_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_size_selection (self, _tmp52_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp51_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp53_ = job;
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp54_ = print_job_get_local_settings (_tmp53_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp55_ = _tmp54_;
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp56_ = print_settings_is_match_aspect_ratio_enabled (_tmp55_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_match_aspect_ratio_enabled (self, _tmp56_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp55_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp57_ = job;
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp58_ = print_job_get_local_settings (_tmp57_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp59_ = _tmp58_;
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp60_ = print_settings_is_print_titles_enabled (_tmp59_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_print_titles_enabled (self, _tmp60_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp59_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp61_ = job;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp62_ = print_job_get_local_settings (_tmp61_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp63_ = _tmp62_;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp64_ = print_settings_get_print_titles_font (_tmp63_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp65_ = _tmp64_;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_print_titles_font (self, _tmp65_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp65_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp63_);
-#line 4054 "Printing.c"
+#line 3743 "Printing.c"
 }
 
 
@@ -4060,67 +3749,67 @@ static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButt
 	GtkRadioButton* _tmp1_ = NULL;
 	GtkRadioButton* _tmp2_ = NULL;
 	GtkRadioButton* _tmp3_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_BUTTON (b));
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = b;
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = sender;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->standard_size_radio;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 4080 "Printing.c"
-		GtkComboBox* _tmp4_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 3769 "Printing.c"
+		GtkComboBoxText* _tmp4_ = NULL;
+#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_STANDARD_SIZE);
-#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->standard_sizes_combo;
-#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 4088 "Printing.c"
+#line 3777 "Printing.c"
 	} else {
 		GtkRadioButton* _tmp5_ = NULL;
 		GtkRadioButton* _tmp6_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = sender;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->custom_size_radio;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == _tmp6_) {
-#line 4098 "Printing.c"
+#line 3787 "Printing.c"
 			GtkEntry* _tmp7_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 535 "/home/jens/Source/shotwell/src/Printing.vala"
 			custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_CUSTOM_SIZE);
-#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->custom_height_entry;
-#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 4106 "Printing.c"
+#line 3795 "Printing.c"
 		} else {
 			GtkRadioButton* _tmp8_ = NULL;
 			GtkRadioButton* _tmp9_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = sender;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->image_per_page_radio;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
 				custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_IMAGE_PER_PAGE);
-#line 4118 "Printing.c"
+#line 3807 "Printing.c"
 			}
 		}
 	}
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 4124 "Printing.c"
+#line 3813 "Printing.c"
 }
 
 
@@ -4135,167 +3824,167 @@ static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) {
 	MeasurementUnit _tmp7_ = 0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = self->priv->local_content_height;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = custom_print_tab_get_user_unit_choice (self);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_format_measurement_as (self, &_tmp1_, _tmp2_);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp0_, _tmp4_);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp4_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = self->priv->custom_width_entry;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = self->priv->local_content_width;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = custom_print_tab_get_user_unit_choice (self);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_format_measurement_as (self, &_tmp6_, _tmp7_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp5_, _tmp9_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp9_);
-#line 4169 "Printing.c"
+#line 3858 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, ContentLayout layout) {
 	ContentLayout _tmp0_ = 0;
-#line 577 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = layout;
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp0_) {
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 4183 "Printing.c"
+#line 3872 "Printing.c"
 		{
-			GtkComboBox* _tmp1_ = NULL;
+			GtkComboBoxText* _tmp1_ = NULL;
 			GtkComboBoxText* _tmp2_ = NULL;
 			GtkEntry* _tmp3_ = NULL;
 			GtkEntry* _tmp4_ = NULL;
 			GtkCheckButton* _tmp5_ = NULL;
-			GtkComboBox* _tmp6_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp6_ = NULL;
+#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = self->priv->standard_sizes_combo;
-#line 580 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 581 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp2_ = self->priv->units_combo;
-#line 581 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 582 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 554 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->custom_width_entry;
-#line 582 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 554 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 555 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = self->priv->custom_height_entry;
-#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 555 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 584 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp5_ = self->priv->aspect_ratio_check;
-#line 584 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 585 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp6_ = self->priv->image_per_page_combo;
-#line 585 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 558 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4217 "Printing.c"
+#line 3906 "Printing.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 4221 "Printing.c"
+#line 3910 "Printing.c"
 		{
-			GtkComboBox* _tmp7_ = NULL;
+			GtkComboBoxText* _tmp7_ = NULL;
 			GtkComboBoxText* _tmp8_ = NULL;
 			GtkEntry* _tmp9_ = NULL;
 			GtkEntry* _tmp10_ = NULL;
 			GtkCheckButton* _tmp11_ = NULL;
-			GtkComboBox* _tmp12_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp12_ = NULL;
+#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->standard_sizes_combo;
-#line 589 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 590 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = self->priv->units_combo;
-#line 590 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->custom_width_entry;
-#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp10_ = self->priv->custom_height_entry;
-#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp11_ = self->priv->aspect_ratio_check;
-#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 594 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp12_ = self->priv->image_per_page_combo;
-#line 594 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 567 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4255 "Printing.c"
+#line 3944 "Printing.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 4259 "Printing.c"
+#line 3948 "Printing.c"
 		{
-			GtkComboBox* _tmp13_ = NULL;
+			GtkComboBoxText* _tmp13_ = NULL;
 			GtkComboBoxText* _tmp14_ = NULL;
 			GtkEntry* _tmp15_ = NULL;
 			GtkEntry* _tmp16_ = NULL;
 			GtkCheckButton* _tmp17_ = NULL;
-			GtkComboBox* _tmp18_ = NULL;
-#line 598 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp18_ = NULL;
+#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = self->priv->standard_sizes_combo;
-#line 598 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp14_ = self->priv->units_combo;
-#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 572 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp15_ = self->priv->custom_width_entry;
-#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 572 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 601 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp16_ = self->priv->custom_height_entry;
-#line 601 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 602 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 574 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp17_ = self->priv->aspect_ratio_check;
-#line 602 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 574 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 575 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp18_ = self->priv->image_per_page_combo;
-#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 575 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 604 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 576 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4293 "Printing.c"
+#line 3982 "Printing.c"
 		}
 		default:
 		{
-#line 607 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:607: unknown ContentLayout enumeration value");
-#line 4299 "Printing.c"
+#line 579 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:579: unknown ContentLayout enumeration value");
+#line 3988 "Printing.c"
 		}
 	}
 }
@@ -4307,98 +3996,90 @@ static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeMod
 	GtkTreeModel* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	GValue _tmp2_ = {0};
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
+	const gchar* _tmp3_ = NULL;
+#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = model;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = *iter;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	val = _tmp2_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = g_value_dup_string (&val);
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = _tmp3_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_free0 (_tmp4_);
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp5_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp3_ = g_value_get_string (&val);
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
+	result = g_strcmp0 (_tmp3_, "-") == 0;
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4342 "Printing.c"
+#line 4023 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLayout content_layout) {
 	ContentLayout _tmp0_ = 0;
 	ContentLayout _tmp1_ = 0;
-#line 619 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 620 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = content_layout;
-#line 620 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_layout_control_state (self, _tmp0_);
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = content_layout;
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp1_) {
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 4361 "Printing.c"
+#line 4042 "Printing.c"
 		{
 			GtkRadioButton* _tmp2_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp2_ = self->priv->standard_size_radio;
-#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 596 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4370 "Printing.c"
+#line 4051 "Printing.c"
 		}
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 4374 "Printing.c"
+#line 4055 "Printing.c"
 		{
 			GtkRadioButton* _tmp3_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->custom_size_radio;
-#line 627 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4383 "Printing.c"
+#line 4064 "Printing.c"
 		}
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 4387 "Printing.c"
+#line 4068 "Printing.c"
 		{
 			GtkRadioButton* _tmp4_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = self->priv->image_per_page_radio;
-#line 631 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 632 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 604 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4396 "Printing.c"
+#line 4077 "Printing.c"
 		}
 		default:
 		{
-#line 635 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:635: unknown ContentLayout enumeration value");
-#line 4402 "Printing.c"
+#line 607 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:607: unknown ContentLayout enumeration value");
+#line 4083 "Printing.c"
 		}
 	}
 }
@@ -4412,48 +4093,48 @@ static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self)
 	gboolean _tmp3_ = FALSE;
 	GtkRadioButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_size_radio;
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_) {
-#line 641 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 613 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_STANDARD_SIZE;
-#line 641 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 613 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4428 "Printing.c"
+#line 4109 "Printing.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->custom_size_radio;
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_) {
-#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 615 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_CUSTOM_SIZE;
-#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 615 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4440 "Printing.c"
+#line 4121 "Printing.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = self->priv->image_per_page_radio;
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp5_) {
-#line 645 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 617 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_IMAGE_PER_PAGE;
-#line 645 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 617 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4452 "Printing.c"
+#line 4133 "Printing.c"
 	}
-#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_error ("Printing.vala:647: inconsistent content layout radio button group stat" \
+#line 619 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_error ("Printing.vala:619: inconsistent content layout radio button group stat" \
 "e");
-#line 4456 "Printing.c"
+#line 4137 "Printing.c"
 }
 
 
@@ -4467,21 +4148,21 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 	Measurement _tmp15_ = {0};
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 622 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 622 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (content_width != NULL);
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *content_width;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.unit;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_height;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_.unit;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4484 "Printing.c"
+#line 4165 "Printing.c"
 		Measurement _tmp4_ = {0};
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -4491,65 +4172,65 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 		Measurement _tmp10_ = {0};
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_width;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = _tmp4_.unit;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_user_unit_choice (self, _tmp5_);
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = *content_width;
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (&self->priv->local_content_height, _tmp7_, &_tmp8_);
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_height = _tmp8_;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->custom_height_entry;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->local_content_height;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = custom_print_tab_format_measurement (self, &_tmp10_);
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = _tmp11_;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp9_, _tmp12_);
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4520 "Printing.c"
+#line 4201 "Printing.c"
 	}
-#line 656 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_width;
-#line 656 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_width = _tmp13_;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->custom_width_entry;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = *content_width;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = custom_print_tab_format_measurement (self, &_tmp15_);
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp14_, _tmp17_);
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4538 "Printing.c"
+#line 4219 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_width (CustomPrintTab* self, Measurement* result) {
 	Measurement _tmp0_ = {0};
-#line 660 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 632 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_width;
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4552 "Printing.c"
+#line 4233 "Printing.c"
 }
 
 
@@ -4563,21 +4244,21 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 	Measurement _tmp15_ = {0};
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
-#line 664 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 636 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 664 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 636 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (content_height != NULL);
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *content_height;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.unit;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_width;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_.unit;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4580 "Printing.c"
+#line 4261 "Printing.c"
 		Measurement _tmp4_ = {0};
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -4587,65 +4268,65 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 		Measurement _tmp10_ = {0};
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_height;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = _tmp4_.unit;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_user_unit_choice (self, _tmp5_);
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = *content_height;
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (&self->priv->local_content_width, _tmp7_, &_tmp8_);
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_width = _tmp8_;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->custom_width_entry;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->local_content_width;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = custom_print_tab_format_measurement (self, &_tmp10_);
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = _tmp11_;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp9_, _tmp12_);
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4616 "Printing.c"
+#line 4297 "Printing.c"
 	}
-#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_height;
-#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_height = _tmp13_;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->custom_height_entry;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = *content_height;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = custom_print_tab_format_measurement (self, &_tmp15_);
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp14_, _tmp17_);
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4634 "Printing.c"
+#line 4315 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_height (CustomPrintTab* self, Measurement* result) {
 	Measurement _tmp0_ = {0};
-#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 646 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_height;
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp0_;
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4648 "Printing.c"
+#line 4329 "Printing.c"
 }
 
 
@@ -4656,155 +4337,155 @@ static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content
 	gint _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = content_ppi;
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = CLAMP (_tmp0_, PRINT_SETTINGS_MIN_CONTENT_PPI, PRINT_SETTINGS_MAX_CONTENT_PPI);
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_ppi = _tmp1_;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->ppi_entry;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->local_content_ppi;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = g_strdup_printf ("%d", _tmp3_);
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp2_, _tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 4679 "Printing.c"
+#line 4360 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_ppi;
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp0_;
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4694 "Printing.c"
+#line 4375 "Printing.c"
 }
 
 
 static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, gint image_per_page) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 689 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->image_per_page_combo;
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = image_per_page;
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (_tmp0_, _tmp1_);
-#line 4709 "Printing.c"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
+#line 4390 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 693 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->image_per_page_combo;
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = gtk_combo_box_get_active (_tmp0_);
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4727 "Printing.c"
+#line 4408 "Printing.c"
 }
 
 
 static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size_selection) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 697 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 669 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_sizes_combo;
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = size_selection;
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (_tmp0_, _tmp1_);
-#line 4742 "Printing.c"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
+#line 4423 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_size_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 701 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 673 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_sizes_combo;
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = gtk_combo_box_get_active (_tmp0_);
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4760 "Printing.c"
+#line 4441 "Printing.c"
 }
 
 
 static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, gboolean enable_state) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 705 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 677 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = enable_state;
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4775 "Printing.c"
+#line 4456 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gboolean print_titles) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 681 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_check;
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_titles;
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4790 "Printing.c"
+#line 4471 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const gchar* fontname) {
 	GtkFontButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (fontname != NULL);
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_font;
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = fontname;
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_font_button_set_font_name (_tmp0_, _tmp1_);
-#line 4807 "Printing.c"
+#line 4488 "Printing.c"
 }
 
 
@@ -4812,17 +4493,17 @@ static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab*
 	gboolean result = FALSE;
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 718 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4825 "Printing.c"
+#line 4506 "Printing.c"
 }
 
 
@@ -4830,17 +4511,17 @@ static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self)
 	gboolean result = FALSE;
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_check;
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4843 "Printing.c"
+#line 4524 "Printing.c"
 }
 
 
@@ -4849,19 +4530,19 @@ static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) {
 	GtkFontButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_font;
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_font_button_get_font_name (_tmp0_);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4864 "Printing.c"
+#line 4545 "Printing.c"
 }
 
 
@@ -4869,17 +4550,17 @@ PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) {
 	PrintJob* result = NULL;
 	PrintJob* _tmp0_ = NULL;
 	PrintJob* _tmp1_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->source_job;
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4882 "Printing.c"
+#line 4563 "Printing.c"
 }
 
 
@@ -4897,143 +4578,148 @@ PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) {
 	gboolean _tmp8_ = FALSE;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 735 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 707 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_settings_new ();
-#line 735 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 707 "/home/jens/Source/shotwell/src/Printing.vala"
 	_result_ = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_content_width (self, &_tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_width (_result_, &_tmp1_);
-#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_content_height (self, &_tmp2_);
-#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_height (_result_, &_tmp2_);
-#line 739 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 711 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_content_layout (self);
-#line 739 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 711 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_layout (_result_, _tmp3_);
-#line 740 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 712 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_get_content_ppi (self);
-#line 740 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 712 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_ppi (_result_, _tmp4_);
-#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = custom_print_tab_get_image_per_page_selection (self);
-#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_image_per_page_selection (_result_, _tmp5_);
-#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = custom_print_tab_get_size_selection (self);
-#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_size_selection (_result_, _tmp6_);
-#line 743 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 715 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 743 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 715 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_match_aspect_ratio_enabled (_result_, _tmp7_);
-#line 744 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 716 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_is_print_titles_enabled (self);
-#line 744 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 716 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_print_titles_enabled (_result_, _tmp8_);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = custom_print_tab_get_print_titles_font (self);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_print_titles_font (_result_, _tmp10_);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp10_);
-#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _result_;
-#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4950 "Printing.c"
+#line 4631 "Printing.c"
 }
 
 
 static void custom_print_tab_class_init (CustomPrintTabClass * klass) {
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+	gint CustomPrintTab_private_offset;
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_parent_class = g_type_class_peek_parent (klass);
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (CustomPrintTabPrivate));
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (klass)->finalize = custom_print_tab_finalize;
-#line 4961 "Printing.c"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	CustomPrintTab_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/printing_widget.ui");
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "standard_size_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, standard_size_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_size_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_size_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "image_per_page_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, image_per_page_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "image_per_page_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, image_per_page_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "standard_sizes_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, standard_sizes_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "units_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, units_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_width_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_width_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_height_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_height_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "ppi_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, ppi_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "aspect_ratio_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, aspect_ratio_check));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_check));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_font", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_font));
+#line 4671 "Printing.c"
 }
 
 
 static void custom_print_tab_instance_init (CustomPrintTab * self) {
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = CUSTOM_PRINT_TAB_GET_PRIVATE (self);
-#line 272 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_image_settings_pane = NULL;
-#line 273 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_size_radio = NULL;
-#line 274 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_size_radio = NULL;
-#line 275 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_radio = NULL;
-#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_combo = NULL;
-#line 277 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_sizes_combo = NULL;
-#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->units_combo = NULL;
-#line 279 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_width_entry = NULL;
-#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_height_entry = NULL;
-#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->aspect_ratio_check = NULL;
-#line 283 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_check = NULL;
-#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_font = NULL;
-#line 285 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&self->priv->local_content_width, 5.0, MEASUREMENT_UNIT_INCHES);
-#line 286 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&self->priv->local_content_height, 5.0, MEASUREMENT_UNIT_INCHES);
-#line 288 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 4998 "Printing.c"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 4686 "Printing.c"
 }
 
 
 static void custom_print_tab_finalize (GObject* obj) {
 	CustomPrintTab * self;
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab);
-#line 272 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_image_settings_pane);
-#line 273 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_size_radio);
 #line 274 "/home/jens/Source/shotwell/src/Printing.vala"
+	_g_object_unref0 (self->priv->standard_size_radio);
+#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_size_radio);
-#line 275 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->image_per_page_radio);
-#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->image_per_page_combo);
-#line 277 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->standard_sizes_combo);
-#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->units_combo);
-#line 279 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 286 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_width_entry);
-#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 288 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_height_entry);
-#line 281 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 290 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->ppi_entry);
-#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->aspect_ratio_check);
-#line 283 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 294 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->title_print_check);
-#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->title_print_font);
-#line 289 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->source_job);
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (custom_print_tab_parent_class)->finalize (obj);
-#line 5036 "Printing.c"
+#line 4722 "Printing.c"
 }
 
 
@@ -5042,7 +4728,7 @@ GType custom_print_tab_get_type (void) {
 	if (g_once_init_enter (&custom_print_tab_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CustomPrintTabClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) custom_print_tab_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CustomPrintTab), 0, (GInstanceInitFunc) custom_print_tab_instance_init, NULL };
 		GType custom_print_tab_type_id;
-		custom_print_tab_type_id = g_type_register_static (gtk_fixed_get_type (), "CustomPrintTab", &g_define_type_info, 0);
+		custom_print_tab_type_id = g_type_register_static (gtk_box_get_type (), "CustomPrintTab", &g_define_type_info, 0);
 		g_once_init_leave (&custom_print_tab_type_id__volatile, custom_print_tab_type_id);
 	}
 	return custom_print_tab_type_id__volatile;
@@ -5064,68 +4750,68 @@ PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) {
 	gdouble _tmp9_ = 0.0;
 	gdouble _tmp10_ = 0.0;
 	gdouble _tmp11_ = 0.0;
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_print), NULL);
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintJob*) g_object_new (object_type, NULL);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_manager_get_instance ();
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_;
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = print_manager_get_global_settings (_tmp1_);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp2_;
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_manager_unref0 (_tmp1_);
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->photos;
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = to_print;
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	gee_array_list_add_all (_tmp3_, _tmp4_);
-#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_embed_page_setup (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_print_operation_get_type (), GtkPrintOperation), TRUE);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = self->priv->photos;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = (Photo*) _tmp6_;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp8_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = dimensions_get_aspect_ratio (&_tmp8_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp7_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_aspect_ratio = _tmp10_;
-#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 733 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = photo_aspect_ratio;
-#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 733 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp11_ < 1.0) {
-#line 5111 "Printing.c"
+#line 4797 "Printing.c"
 		gdouble _tmp12_ = 0.0;
-#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = photo_aspect_ratio;
-#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		photo_aspect_ratio = 1.0 / _tmp12_;
-#line 5117 "Printing.c"
+#line 4803 "Printing.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5121 "Printing.c"
+#line 4807 "Printing.c"
 }
 
 
 PrintJob* print_job_new (GeeCollection* to_print) {
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_job_construct (TYPE_PRINT_JOB, to_print);
-#line 5128 "Printing.c"
+#line 4814 "Printing.c"
 }
 
 
@@ -5133,17 +4819,17 @@ GeeList* print_job_get_photos (PrintJob* self) {
 	GeeList* result = NULL;
 	GeeArrayList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList));
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5146 "Printing.c"
+#line 4832 "Printing.c"
 }
 
 
@@ -5151,17 +4837,17 @@ Photo* print_job_get_source_photo (PrintJob* self) {
 	Photo* result = NULL;
 	GeeArrayList* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = (Photo*) _tmp1_;
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5164 "Printing.c"
+#line 4850 "Printing.c"
 }
 
 
@@ -5176,55 +4862,55 @@ gdouble print_job_get_source_aspect_ratio (PrintJob* self) {
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 773 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), 0.0);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = (Photo*) _tmp1_;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = dimensions_get_aspect_ratio (&_tmp3_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	aspect_ratio = _tmp5_;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp7_ < 1.0) {
-#line 5201 "Printing.c"
+#line 4887 "Printing.c"
 		gdouble _tmp8_ = 0.0;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp8_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = 1.0 / _tmp8_;
-#line 5207 "Printing.c"
+#line 4893 "Printing.c"
 	} else {
 		gdouble _tmp9_ = 0.0;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp9_;
-#line 5214 "Printing.c"
+#line 4900 "Printing.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp6_;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5220 "Printing.c"
+#line 4906 "Printing.c"
 }
 
 
 static gpointer _print_settings_ref0 (gpointer self) {
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_settings_ref (self) : NULL;
-#line 5227 "Printing.c"
+#line 4913 "Printing.c"
 }
 
 
@@ -5232,73 +4918,73 @@ PrintSettings* print_job_get_local_settings (PrintJob* self) {
 	PrintSettings* result = NULL;
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 750 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->settings;
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5245 "Printing.c"
+#line 4931 "Printing.c"
 }
 
 
 void print_job_set_local_settings (PrintJob* self, PrintSettings* settings) {
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 754 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (self));
-#line 782 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 754 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (settings));
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = settings;
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 5264 "Printing.c"
+#line 4950 "Printing.c"
 }
 
 
 static void print_job_class_init (PrintJobClass * klass) {
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_job_parent_class = g_type_class_peek_parent (klass);
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintJobPrivate));
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (klass)->finalize = print_job_finalize;
-#line 5275 "Printing.c"
+#line 4961 "Printing.c"
 }
 
 
 static void print_job_instance_init (PrintJob * self) {
 	GeeArrayList* _tmp0_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = PRINT_JOB_GET_PRIVATE (self);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->photos = _tmp0_;
-#line 5287 "Printing.c"
+#line 4973 "Printing.c"
 }
 
 
 static void print_job_finalize (GObject* obj) {
 	PrintJob * self;
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_JOB, PrintJob);
-#line 752 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 724 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->photos);
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (print_job_parent_class)->finalize (obj);
-#line 5301 "Printing.c"
+#line 4987 "Printing.c"
 }
 
 
@@ -5320,248 +5006,248 @@ StandardPrintSize* standard_print_size_construct (GType object_type, const gchar
 	gchar* _tmp1_ = NULL;
 	Measurement _tmp2_ = {0};
 	Measurement _tmp3_ = {0};
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (width != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (height != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (StandardPrintSize*) g_type_create_instance (object_type);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = name;
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->name);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->name = _tmp1_;
-#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = *width;
-#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->width = _tmp2_;
-#line 791 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 763 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = *height;
-#line 791 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 763 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->height = _tmp3_;
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5349 "Printing.c"
+#line 5035 "Printing.c"
 }
 
 
 StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height) {
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return standard_print_size_construct (TYPE_STANDARD_PRINT_SIZE, name, width, height);
-#line 5356 "Printing.c"
+#line 5042 "Printing.c"
 }
 
 
 static void value_standard_print_size_init (GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5363 "Printing.c"
+#line 5049 "Printing.c"
 }
 
 
 static void value_standard_print_size_free_value (GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (value->data[0].v_pointer);
-#line 5372 "Printing.c"
+#line 5058 "Printing.c"
 	}
 }
 
 
 static void value_standard_print_size_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = standard_print_size_ref (src_value->data[0].v_pointer);
-#line 5382 "Printing.c"
+#line 5068 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5386 "Printing.c"
+#line 5072 "Printing.c"
 	}
 }
 
 
 static gpointer value_standard_print_size_peek_pointer (const GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5394 "Printing.c"
+#line 5080 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5401 "Printing.c"
+#line 5087 "Printing.c"
 		StandardPrintSize* object;
 		object = collect_values[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5408 "Printing.c"
+#line 5094 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5412 "Printing.c"
+#line 5098 "Printing.c"
 		}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = standard_print_size_ref (object);
-#line 5416 "Printing.c"
+#line 5102 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5420 "Printing.c"
+#line 5106 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5424 "Printing.c"
+#line 5110 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	StandardPrintSize** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5435 "Printing.c"
+#line 5121 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 5441 "Printing.c"
+#line 5127 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5445 "Printing.c"
+#line 5131 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = standard_print_size_ref (value->data[0].v_pointer);
-#line 5449 "Printing.c"
+#line 5135 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5453 "Printing.c"
+#line 5139 "Printing.c"
 }
 
 
 GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecStandardPrintSize* spec;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_STANDARD_PRINT_SIZE), NULL);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5467 "Printing.c"
+#line 5153 "Printing.c"
 }
 
 
 gpointer value_get_standard_print_size (const GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE), NULL);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5476 "Printing.c"
+#line 5162 "Printing.c"
 }
 
 
 void value_set_standard_print_size (GValue* value, gpointer v_object) {
 	StandardPrintSize* old;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_ref (value->data[0].v_pointer);
-#line 5496 "Printing.c"
+#line 5182 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5500 "Printing.c"
+#line 5186 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5506 "Printing.c"
+#line 5192 "Printing.c"
 	}
 }
 
 
 void value_take_standard_print_size (GValue* value, gpointer v_object) {
 	StandardPrintSize* old;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5525 "Printing.c"
+#line 5211 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5529 "Printing.c"
+#line 5215 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5535 "Printing.c"
+#line 5221 "Printing.c"
 	}
 }
 
 
 static void standard_print_size_class_init (StandardPrintSizeClass * klass) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	standard_print_size_parent_class = g_type_class_peek_parent (klass);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	((StandardPrintSizeClass *) klass)->finalize = standard_print_size_finalize;
-#line 5545 "Printing.c"
+#line 5231 "Printing.c"
 }
 
 
 static void standard_print_size_instance_init (StandardPrintSize * self) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 5552 "Printing.c"
+#line 5238 "Printing.c"
 }
 
 
 static void standard_print_size_finalize (StandardPrintSize* obj) {
 	StandardPrintSize * self;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STANDARD_PRINT_SIZE, StandardPrintSize);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_handlers_destroy (self);
-#line 794 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->name);
-#line 5564 "Printing.c"
+#line 5250 "Printing.c"
 }
 
 
@@ -5582,24 +5268,24 @@ GType standard_print_size_get_type (void) {
 gpointer standard_print_size_ref (gpointer instance) {
 	StandardPrintSize* self;
 	self = instance;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 5589 "Printing.c"
+#line 5275 "Printing.c"
 }
 
 
 void standard_print_size_unref (gpointer instance) {
 	StandardPrintSize* self;
 	self = instance;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		STANDARD_PRINT_SIZE_GET_CLASS (self)->finalize (self);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5602 "Printing.c"
+#line 5288 "Printing.c"
 	}
 }
 
@@ -5608,625 +5294,641 @@ static PrintManager* print_manager_construct (GType object_type) {
 	PrintManager* self = NULL;
 	GtkPageSetup* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintManager*) g_type_create_instance (object_type);
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = gtk_page_setup_new ();
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->user_page_setup);
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->user_page_setup = _tmp0_;
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_settings_new ();
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5627 "Printing.c"
+#line 5313 "Printing.c"
 }
 
 
 static PrintManager* print_manager_new (void) {
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_manager_construct (TYPE_PRINT_MANAGER);
-#line 5634 "Printing.c"
+#line 5320 "Printing.c"
 }
 
 
 static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5645 "Printing.c"
+#line 5331 "Printing.c"
 	}
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5651 "Printing.c"
+#line 5337 "Printing.c"
 }
 
 
 static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5662 "Printing.c"
+#line 5348 "Printing.c"
 	}
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5668 "Printing.c"
+#line 5354 "Printing.c"
 }
 
 
 static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5679 "Printing.c"
+#line 5365 "Printing.c"
 	}
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5685 "Printing.c"
+#line 5371 "Printing.c"
 }
 
 
 static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5696 "Printing.c"
+#line 5382 "Printing.c"
 	}
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5702 "Printing.c"
+#line 5388 "Printing.c"
 }
 
 
 static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5713 "Printing.c"
+#line 5399 "Printing.c"
 	}
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5719 "Printing.c"
+#line 5405 "Printing.c"
 }
 
 
 static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5730 "Printing.c"
+#line 5416 "Printing.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5736 "Printing.c"
+#line 5422 "Printing.c"
 }
 
 
 static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5747 "Printing.c"
+#line 5433 "Printing.c"
 	}
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5753 "Printing.c"
+#line 5439 "Printing.c"
 }
 
 
 static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5764 "Printing.c"
+#line 5450 "Printing.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5770 "Printing.c"
+#line 5456 "Printing.c"
 }
 
 
 static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5781 "Printing.c"
+#line 5467 "Printing.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5787 "Printing.c"
+#line 5473 "Printing.c"
 }
 
 
 static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5798 "Printing.c"
+#line 5484 "Printing.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5804 "Printing.c"
+#line 5490 "Printing.c"
 }
 
 
 static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5815 "Printing.c"
+#line 5501 "Printing.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5821 "Printing.c"
+#line 5507 "Printing.c"
 }
 
 
 static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5832 "Printing.c"
+#line 5518 "Printing.c"
 	}
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5838 "Printing.c"
+#line 5524 "Printing.c"
 }
 
 
 static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5849 "Printing.c"
+#line 5535 "Printing.c"
 	}
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5855 "Printing.c"
+#line 5541 "Printing.c"
 }
 
 
 static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5866 "Printing.c"
+#line 5552 "Printing.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5872 "Printing.c"
+#line 5558 "Printing.c"
 }
 
 
 static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5883 "Printing.c"
+#line 5569 "Printing.c"
 	}
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5889 "Printing.c"
+#line 5575 "Printing.c"
 }
 
 
 StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* result_length1) {
 	StandardPrintSize** result = NULL;
-	StandardPrintSize** _result_ = NULL;
 	StandardPrintSize** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	StandardPrintSize** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	Measurement _tmp3_ = {0};
-	Measurement _tmp4_ = {0};
-	StandardPrintSize* _tmp5_ = NULL;
-	StandardPrintSize** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	const gchar* _tmp7_ = NULL;
-	Measurement _tmp8_ = {0};
-	Measurement _tmp9_ = {0};
-	StandardPrintSize* _tmp10_ = NULL;
-	StandardPrintSize** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	const gchar* _tmp12_ = NULL;
-	Measurement _tmp13_ = {0};
-	Measurement _tmp14_ = {0};
-	StandardPrintSize* _tmp15_ = NULL;
-	StandardPrintSize** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	Measurement _tmp18_ = {0};
-	Measurement _tmp19_ = {0};
-	StandardPrintSize* _tmp20_ = NULL;
-	StandardPrintSize** _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	const gchar* _tmp22_ = NULL;
-	Measurement _tmp23_ = {0};
-	Measurement _tmp24_ = {0};
-	StandardPrintSize* _tmp25_ = NULL;
-	StandardPrintSize** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	const gchar* _tmp27_ = NULL;
-	Measurement _tmp28_ = {0};
-	Measurement _tmp29_ = {0};
-	StandardPrintSize* _tmp30_ = NULL;
-	StandardPrintSize** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	const gchar* _tmp32_ = NULL;
-	Measurement _tmp33_ = {0};
-	Measurement _tmp34_ = {0};
-	StandardPrintSize* _tmp35_ = NULL;
-	StandardPrintSize** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	Measurement _tmp37_ = {0};
-	Measurement _tmp38_ = {0};
-	StandardPrintSize* _tmp39_ = NULL;
-	StandardPrintSize** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	const gchar* _tmp41_ = NULL;
-	Measurement _tmp42_ = {0};
-	Measurement _tmp43_ = {0};
-	StandardPrintSize* _tmp44_ = NULL;
-	StandardPrintSize** _tmp45_ = NULL;
-	gint _tmp45__length1 = 0;
-	const gchar* _tmp46_ = NULL;
-	Measurement _tmp47_ = {0};
-	Measurement _tmp48_ = {0};
-	StandardPrintSize* _tmp49_ = NULL;
-	StandardPrintSize** _tmp50_ = NULL;
-	gint _tmp50__length1 = 0;
-	const gchar* _tmp51_ = NULL;
-	Measurement _tmp52_ = {0};
-	Measurement _tmp53_ = {0};
-	StandardPrintSize* _tmp54_ = NULL;
-	StandardPrintSize** _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	const gchar* _tmp56_ = NULL;
-	Measurement _tmp57_ = {0};
-	Measurement _tmp58_ = {0};
-	StandardPrintSize* _tmp59_ = NULL;
-	StandardPrintSize** _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	const gchar* _tmp61_ = NULL;
-	Measurement _tmp62_ = {0};
-	Measurement _tmp63_ = {0};
-	StandardPrintSize* _tmp64_ = NULL;
-	StandardPrintSize** _tmp65_ = NULL;
-	gint _tmp65__length1 = 0;
-	const gchar* _tmp66_ = NULL;
-	Measurement _tmp67_ = {0};
-	Measurement _tmp68_ = {0};
-	StandardPrintSize* _tmp69_ = NULL;
-	StandardPrintSize** _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	const gchar* _tmp71_ = NULL;
-	Measurement _tmp72_ = {0};
-	Measurement _tmp73_ = {0};
-	StandardPrintSize* _tmp74_ = NULL;
-	StandardPrintSize** _tmp75_ = NULL;
-	gint _tmp75__length1 = 0;
-#line 815 "/home/jens/Source/shotwell/src/Printing.vala"
+	gint _tmp0__length1 = 0;
+	StandardPrintSize** _tmp76_ = NULL;
+	gint _tmp76__length1 = 0;
+	StandardPrintSize** _tmp77_ = NULL;
+	gint _tmp77__length1 = 0;
+#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp0_ = self->priv->standard_sizes;
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp0__length1 = self->priv->standard_sizes_length1;
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	if (_tmp0_ == NULL) {
+#line 5595 "Printing.c"
+		StandardPrintSize** _tmp1_ = NULL;
+		StandardPrintSize** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		const gchar* _tmp3_ = NULL;
+		Measurement _tmp4_ = {0};
+		Measurement _tmp5_ = {0};
+		StandardPrintSize* _tmp6_ = NULL;
+		StandardPrintSize** _tmp7_ = NULL;
+		gint _tmp7__length1 = 0;
+		const gchar* _tmp8_ = NULL;
+		Measurement _tmp9_ = {0};
+		Measurement _tmp10_ = {0};
+		StandardPrintSize* _tmp11_ = NULL;
+		StandardPrintSize** _tmp12_ = NULL;
+		gint _tmp12__length1 = 0;
+		const gchar* _tmp13_ = NULL;
+		Measurement _tmp14_ = {0};
+		Measurement _tmp15_ = {0};
+		StandardPrintSize* _tmp16_ = NULL;
+		StandardPrintSize** _tmp17_ = NULL;
+		gint _tmp17__length1 = 0;
+		const gchar* _tmp18_ = NULL;
+		Measurement _tmp19_ = {0};
+		Measurement _tmp20_ = {0};
+		StandardPrintSize* _tmp21_ = NULL;
+		StandardPrintSize** _tmp22_ = NULL;
+		gint _tmp22__length1 = 0;
+		const gchar* _tmp23_ = NULL;
+		Measurement _tmp24_ = {0};
+		Measurement _tmp25_ = {0};
+		StandardPrintSize* _tmp26_ = NULL;
+		StandardPrintSize** _tmp27_ = NULL;
+		gint _tmp27__length1 = 0;
+		const gchar* _tmp28_ = NULL;
+		Measurement _tmp29_ = {0};
+		Measurement _tmp30_ = {0};
+		StandardPrintSize* _tmp31_ = NULL;
+		StandardPrintSize** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		const gchar* _tmp33_ = NULL;
+		Measurement _tmp34_ = {0};
+		Measurement _tmp35_ = {0};
+		StandardPrintSize* _tmp36_ = NULL;
+		StandardPrintSize** _tmp37_ = NULL;
+		gint _tmp37__length1 = 0;
+		Measurement _tmp38_ = {0};
+		Measurement _tmp39_ = {0};
+		StandardPrintSize* _tmp40_ = NULL;
+		StandardPrintSize** _tmp41_ = NULL;
+		gint _tmp41__length1 = 0;
+		const gchar* _tmp42_ = NULL;
+		Measurement _tmp43_ = {0};
+		Measurement _tmp44_ = {0};
+		StandardPrintSize* _tmp45_ = NULL;
+		StandardPrintSize** _tmp46_ = NULL;
+		gint _tmp46__length1 = 0;
+		const gchar* _tmp47_ = NULL;
+		Measurement _tmp48_ = {0};
+		Measurement _tmp49_ = {0};
+		StandardPrintSize* _tmp50_ = NULL;
+		StandardPrintSize** _tmp51_ = NULL;
+		gint _tmp51__length1 = 0;
+		const gchar* _tmp52_ = NULL;
+		Measurement _tmp53_ = {0};
+		Measurement _tmp54_ = {0};
+		StandardPrintSize* _tmp55_ = NULL;
+		StandardPrintSize** _tmp56_ = NULL;
+		gint _tmp56__length1 = 0;
+		const gchar* _tmp57_ = NULL;
+		Measurement _tmp58_ = {0};
+		Measurement _tmp59_ = {0};
+		StandardPrintSize* _tmp60_ = NULL;
+		StandardPrintSize** _tmp61_ = NULL;
+		gint _tmp61__length1 = 0;
+		const gchar* _tmp62_ = NULL;
+		Measurement _tmp63_ = {0};
+		Measurement _tmp64_ = {0};
+		StandardPrintSize* _tmp65_ = NULL;
+		StandardPrintSize** _tmp66_ = NULL;
+		gint _tmp66__length1 = 0;
+		const gchar* _tmp67_ = NULL;
+		Measurement _tmp68_ = {0};
+		Measurement _tmp69_ = {0};
+		StandardPrintSize* _tmp70_ = NULL;
+		StandardPrintSize** _tmp71_ = NULL;
+		gint _tmp71__length1 = 0;
+		const gchar* _tmp72_ = NULL;
+		Measurement _tmp73_ = {0};
+		Measurement _tmp74_ = {0};
+		StandardPrintSize* _tmp75_ = NULL;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp1_ = g_new0 (StandardPrintSize*, 0 + 1);
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes = _tmp1_;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes_length1 = 0;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp2_ = self->priv->standard_sizes;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp2__length1 = self->priv->standard_sizes_length1;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp3_ = _ ("Wallet (2 × 3 in.)");
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp4_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp5_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp6_ = standard_print_size_new (_tmp3_, &_tmp4_, &_tmp5_);
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp6_);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp7_ = self->priv->standard_sizes;
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp7__length1 = self->priv->standard_sizes_length1;
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp8_ = _ ("Notecard (3 × 5 in.)");
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp9_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp10_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp11_ = standard_print_size_new (_tmp8_, &_tmp9_, &_tmp10_);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp11_);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp12_ = self->priv->standard_sizes;
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp12__length1 = self->priv->standard_sizes_length1;
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp13_ = _ ("4 × 6 in.");
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp14_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp15_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp16_ = standard_print_size_new (_tmp13_, &_tmp14_, &_tmp15_);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp16_);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp17_ = self->priv->standard_sizes;
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp17__length1 = self->priv->standard_sizes_length1;
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp18_ = _ ("5 × 7 in.");
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp19_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp20_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp21_ = standard_print_size_new (_tmp18_, &_tmp19_, &_tmp20_);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp22_ = self->priv->standard_sizes;
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp22__length1 = self->priv->standard_sizes_length1;
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp23_ = _ ("8 × 10 in.");
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp24_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp25_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp26_ = standard_print_size_new (_tmp23_, &_tmp24_, &_tmp25_);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp26_);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp27_ = self->priv->standard_sizes;
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp27__length1 = self->priv->standard_sizes_length1;
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp28_ = _ ("11 × 14 in.");
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp29_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp30_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp31_ = standard_print_size_new (_tmp28_, &_tmp29_, &_tmp30_);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp31_);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp32_ = self->priv->standard_sizes;
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp32__length1 = self->priv->standard_sizes_length1;
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp33_ = _ ("16 × 20 in.");
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp34_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp35_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp36_ = standard_print_size_new (_tmp33_, &_tmp34_, &_tmp35_);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp36_);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp37_ = self->priv->standard_sizes;
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp37__length1 = self->priv->standard_sizes_length1;
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp38_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp39_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp40_ = standard_print_size_new ("-", &_tmp38_, &_tmp39_);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp40_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp0_ = g_new0 (StandardPrintSize*, 0 + 1);
+		_tmp41_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_result_ = _tmp0_;
+		_tmp41__length1 = self->priv->standard_sizes_length1;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_result__length1 = 0;
+		_tmp42_ = _ ("Metric Wallet (9 × 13 cm)");
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	__result__size_ = _result__length1;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = _result_;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1__length1 = _result__length1;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = _ ("Wallet (2 × 3 in.)");
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp3_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp4_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = standard_print_size_new (_tmp2_, &_tmp3_, &_tmp4_);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add112 (&_result_, &_result__length1, &__result__size_, _tmp5_);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = _result_;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6__length1 = _result__length1;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = _ ("Notecard (3 × 5 in.)");
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp8_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp9_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = standard_print_size_new (_tmp7_, &_tmp8_, &_tmp9_);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add113 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = _result_;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11__length1 = _result__length1;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _ ("4 × 6 in.");
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp13_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp14_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = standard_print_size_new (_tmp12_, &_tmp13_, &_tmp14_);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add114 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16_ = _result_;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16__length1 = _result__length1;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp17_ = _ ("5 × 7 in.");
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp18_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp19_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp20_ = standard_print_size_new (_tmp17_, &_tmp18_, &_tmp19_);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add115 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21_ = _result_;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21__length1 = _result__length1;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp22_ = _ ("8 × 10 in.");
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp23_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp24_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp25_ = standard_print_size_new (_tmp22_, &_tmp23_, &_tmp24_);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add116 (&_result_, &_result__length1, &__result__size_, _tmp25_);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26_ = _result_;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26__length1 = _result__length1;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp27_ = _ ("11 × 14 in.");
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp28_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp29_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp30_ = standard_print_size_new (_tmp27_, &_tmp28_, &_tmp29_);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add117 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp31_ = _result_;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp31__length1 = _result__length1;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp32_ = _ ("16 × 20 in.");
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp33_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp34_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp35_ = standard_print_size_new (_tmp32_, &_tmp33_, &_tmp34_);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add118 (&_result_, &_result__length1, &__result__size_, _tmp35_);
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36_ = _result_;
+		measurement_init (&_tmp43_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp44_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp45_ = standard_print_size_new (_tmp42_, &_tmp43_, &_tmp44_);
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp46_ = self->priv->standard_sizes;
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp46__length1 = self->priv->standard_sizes_length1;
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp47_ = _ ("Postcard (10 × 15 cm)");
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp48_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp49_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp50_ = standard_print_size_new (_tmp47_, &_tmp48_, &_tmp49_);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp50_);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp51_ = self->priv->standard_sizes;
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp51__length1 = self->priv->standard_sizes_length1;
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp52_ = _ ("13 × 18 cm");
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp53_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp54_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp55_ = standard_print_size_new (_tmp52_, &_tmp53_, &_tmp54_);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp55_);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp56_ = self->priv->standard_sizes;
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp56__length1 = self->priv->standard_sizes_length1;
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp57_ = _ ("18 × 24 cm");
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp58_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp59_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp60_ = standard_print_size_new (_tmp57_, &_tmp58_, &_tmp59_);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp60_);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp61_ = self->priv->standard_sizes;
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp61__length1 = self->priv->standard_sizes_length1;
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp62_ = _ ("20 × 30 cm");
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp63_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp64_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp65_ = standard_print_size_new (_tmp62_, &_tmp63_, &_tmp64_);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp65_);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp66_ = self->priv->standard_sizes;
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp66__length1 = self->priv->standard_sizes_length1;
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp67_ = _ ("24 × 40 cm");
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp68_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp69_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp70_ = standard_print_size_new (_tmp67_, &_tmp68_, &_tmp69_);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp70_);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp71_ = self->priv->standard_sizes;
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp71__length1 = self->priv->standard_sizes_length1;
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp72_ = _ ("30 × 40 cm");
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp73_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp74_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp75_ = standard_print_size_new (_tmp72_, &_tmp73_, &_tmp74_);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp75_);
+#line 5904 "Printing.c"
+	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36__length1 = _result__length1;
+	_tmp76_ = self->priv->standard_sizes;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp37_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+	_tmp76__length1 = self->priv->standard_sizes_length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp38_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+	_tmp77_ = _tmp76_;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp39_ = standard_print_size_new ("-", &_tmp37_, &_tmp38_);
+	_tmp77__length1 = _tmp76__length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add119 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp40_ = _result_;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp40__length1 = _result__length1;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp41_ = _ ("Metric Wallet (9 × 13 cm)");
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp42_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp43_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp44_ = standard_print_size_new (_tmp41_, &_tmp42_, &_tmp43_);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add120 (&_result_, &_result__length1, &__result__size_, _tmp44_);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45_ = _result_;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45__length1 = _result__length1;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp46_ = _ ("Postcard (10 × 15 cm)");
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp47_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp48_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp49_ = standard_print_size_new (_tmp46_, &_tmp47_, &_tmp48_);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add121 (&_result_, &_result__length1, &__result__size_, _tmp49_);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50_ = _result_;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50__length1 = _result__length1;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp51_ = _ ("13 × 18 cm");
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp52_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp53_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp54_ = standard_print_size_new (_tmp51_, &_tmp52_, &_tmp53_);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add122 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp55_ = _result_;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp55__length1 = _result__length1;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp56_ = _ ("18 × 24 cm");
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp57_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp58_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp59_ = standard_print_size_new (_tmp56_, &_tmp57_, &_tmp58_);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add123 (&_result_, &_result__length1, &__result__size_, _tmp59_);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp60_ = _result_;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp60__length1 = _result__length1;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp61_ = _ ("20 × 30 cm");
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp62_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp63_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp64_ = standard_print_size_new (_tmp61_, &_tmp62_, &_tmp63_);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add124 (&_result_, &_result__length1, &__result__size_, _tmp64_);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65_ = _result_;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65__length1 = _result__length1;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp66_ = _ ("24 × 40 cm");
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp67_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp68_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp69_ = standard_print_size_new (_tmp66_, &_tmp67_, &_tmp68_);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add125 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70_ = _result_;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70__length1 = _result__length1;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp71_ = _ ("30 × 40 cm");
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp72_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp73_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp74_ = standard_print_size_new (_tmp71_, &_tmp72_, &_tmp73_);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add126 (&_result_, &_result__length1, &__result__size_, _tmp74_);
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75_ = _result_;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75__length1 = _result__length1;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (result_length1) {
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-		*result_length1 = _tmp75__length1;
-#line 6216 "Printing.c"
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+		*result_length1 = _tmp77__length1;
+#line 5918 "Printing.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp75_;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+	result = _tmp77_;
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6222 "Printing.c"
+#line 5924 "Printing.c"
 }
 
 
 static gpointer _print_manager_ref0 (gpointer self) {
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_manager_ref (self) : NULL;
-#line 6229 "Printing.c"
+#line 5931 "Printing.c"
 }
 
 
@@ -6235,59 +5937,59 @@ PrintManager* print_manager_get_instance (void) {
 	PrintManager* _tmp0_ = NULL;
 	PrintManager* _tmp2_ = NULL;
 	PrintManager* _tmp3_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_manager_instance;
-#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == NULL) {
-#line 6242 "Printing.c"
+#line 5944 "Printing.c"
 		PrintManager* _tmp1_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = print_manager_new ();
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_manager_unref0 (print_manager_instance);
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_instance = _tmp1_;
-#line 6250 "Printing.c"
+#line 5952 "Printing.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = print_manager_instance;
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _print_manager_ref0 (_tmp2_);
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp3_;
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6260 "Printing.c"
+#line 5962 "Printing.c"
 }
 
 
 static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, GtkPrintContext* context, gpointer self) {
-#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_begin_print ((PrintManager*) self, _sender, context);
-#line 6267 "Printing.c"
+#line 5969 "Printing.c"
 }
 
 
 static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 882 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_draw_page ((PrintManager*) self, _sender, context, page_nr);
-#line 6274 "Printing.c"
+#line 5976 "Printing.c"
 }
 
 
 static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, gpointer self) {
 	GObject* result;
 	result = print_manager_on_create_custom_widget ((PrintManager*) self, _sender);
-#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 858 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6283 "Printing.c"
+#line 5985 "Printing.c"
 }
 
 
 static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, gpointer self) {
-#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_status_changed ((PrintManager*) self, _sender);
-#line 6290 "Printing.c"
+#line 5992 "Printing.c"
 }
 
 
@@ -6315,214 +6017,214 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 	AppWindow* _tmp27_ = NULL;
 	const gchar* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_print));
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = to_print;
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_job_new (_tmp0_);
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 876 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _ ("Image Settings");
-#line 876 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_custom_tab_label (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp2_);
-#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 852 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_unit (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_UNIT_INCH);
-#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 853 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), 1);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = print_job_get_source_photo (job);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_;
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = _tmp5_;
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 880 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 855 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = self->priv->user_page_setup;
-#line 880 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 855 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp7_);
-#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "begin-print", (GCallback) _print_manager_on_begin_print_gtk_print_operation_begin_print, self);
-#line 882 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "draw-page", (GCallback) _print_manager_on_draw_page_gtk_print_operation_draw_page, self);
-#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 858 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "create-custom-widget", (GCallback) _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget, self);
-#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "status-changed", (GCallback) _print_manager_on_status_changed_gtk_print_operation_status_changed, self);
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_;
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE_WINDOW, PageWindow));
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp9_);
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = g_cancellable_new ();
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = _tmp10_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = app_window_get_instance ();
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = _ ("Printing…");
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->cancellable;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), _tmp13_, _tmp14_);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_object_ref_sink (_tmp15_);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = _tmp15_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp12_);
-#line 891 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 866 "/home/jens/Source/shotwell/src/Printing.vala"
 	err_msg = NULL;
-#line 6396 "Printing.c"
+#line 6098 "Printing.c"
 	{
 		GtkPrintOperationResult _result_ = 0;
 		AppWindow* _tmp16_ = NULL;
 		AppWindow* _tmp17_ = NULL;
 		GtkPrintOperationResult _tmp18_ = 0;
 		GtkPrintOperationResult _tmp19_ = 0;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = _tmp16_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), &_inner_error_);
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp19_ = _tmp18_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (_tmp17_);
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_result_ = _tmp19_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6417 "Printing.c"
-			goto __catch467_g_error;
+#line 6119 "Printing.c"
+			goto __catch468_g_error;
 		}
-#line 895 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 870 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
-#line 6422 "Printing.c"
+#line 6124 "Printing.c"
 			GtkPageSetup* _tmp20_ = NULL;
 			GtkPageSetup* _tmp21_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp20_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp21_ = _g_object_ref0 (_tmp20_);
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (self->priv->user_page_setup);
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			self->priv->user_page_setup = _tmp21_;
-#line 6433 "Printing.c"
+#line 6135 "Printing.c"
 		}
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally468;
+	__catch468_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
 		const gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_inner_error_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 873 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = e;
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = _tmp22_->message;
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = g_strdup (_tmp23_);
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (err_msg);
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		err_msg = _tmp24_;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 6461 "Printing.c"
+#line 6163 "Printing.c"
 	}
-	__finally467:
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+	__finally468:
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (err_msg);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_critical ("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 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_clear_error (&_inner_error_);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6476 "Printing.c"
+#line 6178 "Printing.c"
 	}
-#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = self->priv->progress_dialog;
-#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
 	progress_dialog_close (_tmp25_);
-#line 903 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 903 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = NULL;
-#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26_ = app_window_get_instance ();
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = _tmp26_;
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow));
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp27_);
-#line 908 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = err_msg;
-#line 908 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp28_ != NULL) {
-#line 6502 "Printing.c"
+#line 6204 "Printing.c"
 		const gchar* _tmp29_ = NULL;
 		const gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _ ("Unable to print photo:\n\n%s");
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = err_msg;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = g_strdup_printf (_tmp29_, _tmp30_);
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = _tmp31_;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp32_);
-#line 6519 "Printing.c"
+#line 6221 "Printing.c"
 	}
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (err_msg);
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6525 "Printing.c"
+#line 6227 "Printing.c"
 }
 
 
@@ -6540,74 +6242,74 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 	PrintSettings* _tmp11_ = NULL;
 	ContentLayout _tmp12_ = 0;
 	gboolean _tmp13_ = FALSE;
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (emitting_object));
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:913: on_begin_print");
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:888: on_begin_print");
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6561 "Printing.c"
+#line 6263 "Printing.c"
 		GCancellable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6570 "Printing.c"
+#line 6272 "Printing.c"
 	} else {
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6574 "Printing.c"
+#line 6276 "Printing.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6578 "Printing.c"
+#line 6280 "Printing.c"
 		PrintJob* _tmp6_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 894 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
-#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 894 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6588 "Printing.c"
+#line 6290 "Printing.c"
 	}
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = job;
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = print_job_get_photos (_tmp7_);
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	photos = _tmp8_;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = job;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = print_job_get_local_settings (_tmp9_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = _tmp10_;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = print_settings_get_content_layout (_tmp11_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = _tmp12_ == CONTENT_LAYOUT_IMAGE_PER_PAGE;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp11_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp13_) {
-#line 6610 "Printing.c"
+#line 6312 "Printing.c"
 		PrintLayout layout = 0;
 		PrintJob* _tmp14_ = NULL;
 		PrintSettings* _tmp15_ = NULL;
@@ -6621,61 +6323,61 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 		PrintLayout _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		gdouble _tmp25_ = 0.0;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = job;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp15_ = print_job_get_local_settings (_tmp14_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp16_ = _tmp15_;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = print_settings_get_image_per_page_selection (_tmp16_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = (PrintLayout) _tmp17_;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp16_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		layout = _tmp18_;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp19_ = job;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp20_ = photos;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = _tmp21_;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = layout;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = print_layout_get_per_page (_tmp23_);
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = ceil (((gdouble) _tmp22_) / ((gdouble) _tmp24_));
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_print_operation_get_type (), GtkPrintOperation), (gint) _tmp25_);
-#line 6654 "Printing.c"
+#line 6356 "Printing.c"
 	} else {
 		PrintJob* _tmp26_ = NULL;
 		GeeList* _tmp27_ = NULL;
 		gint _tmp28_ = 0;
 		gint _tmp29_ = 0;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = job;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = photos;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_print_operation_get_type (), GtkPrintOperation), _tmp29_);
-#line 6670 "Printing.c"
+#line 6372 "Printing.c"
 	}
-#line 932 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 907 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (photos);
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6678 "Printing.c"
+#line 6380 "Printing.c"
 }
 
 
@@ -6683,43 +6385,43 @@ static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperati
 	GtkPrintOperation* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	ProgressDialog* _tmp2_ = NULL;
-#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 910 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 910 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (job));
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job;
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_operation_get_status_string (_tmp0_);
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:936: on_status_changed: %s", _tmp1_);
-#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:911: on_status_changed: %s", _tmp1_);
+#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->progress_dialog;
-#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ != NULL) {
-#line 6700 "Printing.c"
+#line 6402 "Printing.c"
 		ProgressDialog* _tmp3_ = NULL;
 		GtkPrintOperation* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = self->priv->progress_dialog;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = job;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = gtk_print_operation_get_status_string (_tmp4_);
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		progress_dialog_set_status (_tmp3_, _tmp5_);
-#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
 		spin_event_loop ();
-#line 6714 "Printing.c"
+#line 6416 "Printing.c"
 	}
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6722 "Printing.c"
+#line 6424 "Printing.c"
 }
 
 
@@ -6764,828 +6466,812 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 	ContentLayout _tmp31_ = 0;
 	ContentLayout _tmp32_ = 0;
 	ContentLayout _tmp33_ = 0;
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (emitting_object));
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 946 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:946: on_draw_page");
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:921: on_draw_page");
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6785 "Printing.c"
+#line 6487 "Printing.c"
 		GCancellable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6794 "Printing.c"
+#line 6496 "Printing.c"
 	} else {
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6798 "Printing.c"
+#line 6500 "Printing.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6802 "Printing.c"
+#line 6504 "Printing.c"
 		PrintJob* _tmp6_ = NULL;
-#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
-#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 954 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 954 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6812 "Printing.c"
+#line 6514 "Printing.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 932 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = job_context;
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = gtk_print_context_get_page_setup (_tmp7_);
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_setup = _tmp9_;
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = page_setup;
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = gtk_page_setup_get_page_width (_tmp10_, GTK_UNIT_INCH);
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_width = _tmp11_;
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = page_setup;
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = gtk_page_setup_get_page_height (_tmp12_, GTK_UNIT_INCH);
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_height = _tmp13_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = job;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = print_job_get_local_settings (_tmp14_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = _tmp15_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = print_settings_get_content_ppi (_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = (gdouble) _tmp17_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp18_;
-#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = dpi;
-#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
 	inv_dpi = 1.0 / _tmp19_;
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = job_context;
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21_ = gtk_print_context_get_cairo_context (_tmp20_);
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp22_ = _cairo_reference0 (_tmp21_);
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp22_;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp23_ = dc;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp24_ = inv_dpi;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = inv_dpi;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_scale (_tmp23_, _tmp24_, _tmp25_);
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26_ = job;
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = print_job_get_photos (_tmp26_);
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	photos = _tmp27_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = job;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp29_ = print_job_get_local_settings (_tmp28_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp30_ = _tmp29_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = print_settings_get_content_layout (_tmp30_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = _tmp31_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp30_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	content_layout = _tmp32_;
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = content_layout;
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp33_) {
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 6898 "Printing.c"
+#line 6600 "Printing.c"
 		{
 			gdouble canvas_width = 0.0;
 			gdouble canvas_height = 0.0;
 			ContentLayout _tmp34_ = 0;
+			gint _tmp66_ = 0;
+			GeeList* _tmp67_ = NULL;
 			gint _tmp68_ = 0;
-			GeeList* _tmp69_ = NULL;
-			gint _tmp70_ = 0;
-			gint _tmp71_ = 0;
-			ProgressDialog* _tmp117_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+			gint _tmp69_ = 0;
+			ProgressDialog* _tmp115_ = NULL;
+#line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp34_ = content_layout;
-#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp34_ == CONTENT_LAYOUT_STANDARD_SIZE) {
-#line 6912 "Printing.c"
+#line 6614 "Printing.c"
 				gint _tmp35_ = 0;
 				StandardPrintSize** _tmp36_ = NULL;
-				StandardPrintSize** _tmp37_ = NULL;
-				gint _tmp37__length1 = 0;
-				PrintJob* _tmp38_ = NULL;
+				PrintJob* _tmp37_ = NULL;
+				PrintSettings* _tmp38_ = NULL;
 				PrintSettings* _tmp39_ = NULL;
-				PrintSettings* _tmp40_ = NULL;
-				gint _tmp41_ = 0;
-				StandardPrintSize* _tmp42_ = NULL;
-				Measurement _tmp43_ = {0};
-				gdouble _tmp44_ = 0.0;
-				gint _tmp45_ = 0;
-				StandardPrintSize** _tmp46_ = NULL;
-				StandardPrintSize** _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				PrintJob* _tmp48_ = NULL;
-				PrintSettings* _tmp49_ = NULL;
-				PrintSettings* _tmp50_ = NULL;
-				gint _tmp51_ = 0;
-				StandardPrintSize* _tmp52_ = NULL;
-				Measurement _tmp53_ = {0};
-				gdouble _tmp54_ = 0.0;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
+				gint _tmp40_ = 0;
+				StandardPrintSize* _tmp41_ = NULL;
+				Measurement _tmp42_ = {0};
+				gdouble _tmp43_ = 0.0;
+				gint _tmp44_ = 0;
+				StandardPrintSize** _tmp45_ = NULL;
+				PrintJob* _tmp46_ = NULL;
+				PrintSettings* _tmp47_ = NULL;
+				PrintSettings* _tmp48_ = NULL;
+				gint _tmp49_ = 0;
+				StandardPrintSize* _tmp50_ = NULL;
+				Measurement _tmp51_ = {0};
+				gdouble _tmp52_ = 0.0;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp36_ = print_manager_get_standard_sizes (self, &_tmp35_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37_ = _tmp36_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37__length1 = _tmp35_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp38_ = job;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp39_ = print_job_get_local_settings (_tmp38_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp40_ = _tmp39_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp41_ = print_settings_get_size_selection (_tmp40_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp42_ = _tmp37_[_tmp41_];
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp42_->width, MEASUREMENT_UNIT_INCHES, &_tmp43_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp44_ = _tmp43_.value;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_width = _tmp44_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp40_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37_ = (_vala_array_free (_tmp37_, _tmp37__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp37_ = job;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp38_ = print_job_get_local_settings (_tmp37_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp39_ = _tmp38_;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp40_ = print_settings_get_size_selection (_tmp39_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp41_ = _tmp36_[_tmp40_];
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp41_->width, MEASUREMENT_UNIT_INCHES, &_tmp42_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp43_ = _tmp42_.value;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_width = _tmp43_;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp39_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp45_ = print_manager_get_standard_sizes (self, &_tmp44_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp46_ = job;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp47_ = print_job_get_local_settings (_tmp46_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp48_ = _tmp47_;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp49_ = print_settings_get_size_selection (_tmp48_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp50_ = _tmp45_[_tmp49_];
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp50_->height, MEASUREMENT_UNIT_INCHES, &_tmp51_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp52_ = _tmp51_.value;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_height = _tmp52_;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp48_);
+#line 6673 "Printing.c"
+			} else {
+				ContentLayout _tmp53_ = 0;
+				PrintJob* _tmp54_ = NULL;
+				PrintSettings* _tmp55_ = NULL;
+				PrintSettings* _tmp56_ = NULL;
+				Measurement _tmp57_ = {0};
+				Measurement _tmp58_ = {0};
+				gdouble _tmp59_ = 0.0;
+				PrintJob* _tmp60_ = NULL;
+				PrintSettings* _tmp61_ = NULL;
+				PrintSettings* _tmp62_ = NULL;
+				Measurement _tmp63_ = {0};
+				Measurement _tmp64_ = {0};
+				gdouble _tmp65_ = 0.0;
+#line 955 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp53_ = content_layout;
+#line 955 "/home/jens/Source/shotwell/src/Printing.vala"
+				_vala_assert (_tmp53_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE");
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp54_ = job;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp55_ = print_job_get_local_settings (_tmp54_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp56_ = _tmp55_;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_settings_get_content_width (_tmp56_, &_tmp57_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp57_, MEASUREMENT_UNIT_INCHES, &_tmp58_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp59_ = _tmp58_.value;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_width = _tmp59_;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp56_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp60_ = job;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp61_ = print_job_get_local_settings (_tmp60_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp62_ = _tmp61_;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_settings_get_content_height (_tmp62_, &_tmp63_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp63_, MEASUREMENT_UNIT_INCHES, &_tmp64_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp65_ = _tmp64_.value;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_height = _tmp65_;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp62_);
+#line 6724 "Printing.c"
+			}
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp66_ = page_num;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp67_ = photos;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp69_ = _tmp68_;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			if (_tmp66_ < _tmp69_) {
+#line 6736 "Printing.c"
+				Dimensions photo_dimensions = {0};
+				GeeList* _tmp70_ = NULL;
+				gint _tmp71_ = 0;
+				gpointer _tmp72_ = NULL;
+				Photo* _tmp73_ = NULL;
+				Dimensions _tmp74_ = {0};
+				Dimensions _tmp75_ = {0};
+				gdouble photo_aspect_ratio = 0.0;
+				gdouble _tmp76_ = 0.0;
+				gdouble canvas_aspect_ratio = 0.0;
+				gdouble _tmp77_ = 0.0;
+				gdouble _tmp78_ = 0.0;
+				gdouble _tmp79_ = 0.0;
+				gdouble _tmp80_ = 0.0;
+				gdouble _tmp81_ = 0.0;
+				gdouble _tmp82_ = 0.0;
+				gdouble dx = 0.0;
+				gdouble _tmp86_ = 0.0;
+				gdouble _tmp87_ = 0.0;
+				gdouble dy = 0.0;
+				gdouble _tmp88_ = 0.0;
+				gdouble _tmp89_ = 0.0;
+				GeeList* _tmp90_ = NULL;
+				gint _tmp91_ = 0;
+				gpointer _tmp92_ = NULL;
+				Photo* _tmp93_ = NULL;
+				gdouble _tmp94_ = 0.0;
+				gdouble _tmp95_ = 0.0;
+				gdouble _tmp96_ = 0.0;
+				gdouble _tmp97_ = 0.0;
+				PrintJob* _tmp98_ = NULL;
+				GtkPrintContext* _tmp99_ = NULL;
+				PrintJob* _tmp100_ = NULL;
+				PrintSettings* _tmp101_ = NULL;
+				PrintSettings* _tmp102_ = NULL;
+				gboolean _tmp103_ = FALSE;
+				gboolean _tmp104_ = FALSE;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp70_ = photos;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp71_ = page_num;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp72_ = gee_list_get (_tmp70_, _tmp71_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp73_ = (Photo*) _tmp72_;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp74_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp75_ = _tmp74_;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_object_unref0 (_tmp73_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				photo_dimensions = _tmp75_;
+#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp76_ = dimensions_get_aspect_ratio (&photo_dimensions);
+#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+				photo_aspect_ratio = _tmp76_;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp77_ = canvas_width;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp78_ = canvas_height;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_aspect_ratio = ((gdouble) _tmp77_) / _tmp78_;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp79_ = canvas_aspect_ratio;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp80_ = floor (_tmp79_);
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp81_ = photo_aspect_ratio;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp82_ = floor (_tmp81_);
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				if (_tmp80_ != _tmp82_) {
+#line 6810 "Printing.c"
+					gdouble canvas_tmp = 0.0;
+					gdouble _tmp83_ = 0.0;
+					gdouble _tmp84_ = 0.0;
+					gdouble _tmp85_ = 0.0;
+#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp83_ = canvas_width;
+#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_tmp = _tmp83_;
+#line 968 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp84_ = canvas_height;
+#line 968 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_width = _tmp84_;
+#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp85_ = canvas_tmp;
+#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_height = _tmp85_;
+#line 6827 "Printing.c"
+				}
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp86_ = page_width;
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp87_ = canvas_width;
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				dx = (_tmp86_ - _tmp87_) / 2.0;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp88_ = page_height;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp89_ = canvas_height;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				dy = (_tmp88_ - _tmp89_) / 2.0;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp90_ = photos;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp91_ = page_num;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp92_ = gee_list_get (_tmp90_, _tmp91_);
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp93_ = (Photo*) _tmp92_;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp94_ = dx;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp95_ = dy;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp96_ = canvas_width;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp97_ = canvas_height;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp98_ = job;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp99_ = job_context;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_manager_fit_image_to_canvas (self, _tmp93_, _tmp94_, _tmp95_, _tmp96_, _tmp97_, TRUE, _tmp98_, _tmp99_);
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_object_unref0 (_tmp93_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp100_ = job;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp101_ = print_job_get_local_settings (_tmp100_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp102_ = _tmp101_;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp103_ = print_settings_is_print_titles_enabled (_tmp102_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp104_ = _tmp103_;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp102_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				if (_tmp104_) {
+#line 6879 "Printing.c"
+					gdouble _tmp105_ = 0.0;
+					gdouble _tmp106_ = 0.0;
+					GeeList* _tmp107_ = NULL;
+					gint _tmp108_ = 0;
+					gpointer _tmp109_ = NULL;
+					Photo* _tmp110_ = NULL;
+					gchar* _tmp111_ = NULL;
+					gchar* _tmp112_ = NULL;
+					PrintJob* _tmp113_ = NULL;
+					GtkPrintContext* _tmp114_ = NULL;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp46_ = print_manager_get_standard_sizes (self, &_tmp45_);
+					_tmp105_ = page_width;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47_ = _tmp46_;
+					_tmp106_ = page_height;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47__length1 = _tmp45_;
+					_tmp107_ = photos;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp48_ = job;
+					_tmp108_ = page_num;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp49_ = print_job_get_local_settings (_tmp48_);
+					_tmp109_ = gee_list_get (_tmp107_, _tmp108_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp50_ = _tmp49_;
+					_tmp110_ = (Photo*) _tmp109_;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp51_ = print_settings_get_size_selection (_tmp50_);
+					_tmp111_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_DATA_OBJECT, DataObject));
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp52_ = _tmp47_[_tmp51_];
+					_tmp112_ = _tmp111_;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp52_->height, MEASUREMENT_UNIT_INCHES, &_tmp53_);
+					_tmp113_ = job;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp54_ = _tmp53_.value;
+					_tmp114_ = job_context;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_height = _tmp54_;
+					print_manager_add_title_to_canvas (self, _tmp105_ / 2, _tmp106_, _tmp112_, _tmp113_, _tmp114_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp50_);
+					_g_free0 (_tmp112_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47_ = (_vala_array_free (_tmp47_, _tmp47__length1, (GDestroyNotify) standard_print_size_unref), NULL);
-#line 6987 "Printing.c"
-			} else {
-				ContentLayout _tmp55_ = 0;
-				PrintJob* _tmp56_ = NULL;
-				PrintSettings* _tmp57_ = NULL;
-				PrintSettings* _tmp58_ = NULL;
-				Measurement _tmp59_ = {0};
-				Measurement _tmp60_ = {0};
-				gdouble _tmp61_ = 0.0;
-				PrintJob* _tmp62_ = NULL;
-				PrintSettings* _tmp63_ = NULL;
-				PrintSettings* _tmp64_ = NULL;
-				Measurement _tmp65_ = {0};
-				Measurement _tmp66_ = {0};
-				gdouble _tmp67_ = 0.0;
-#line 980 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp55_ = content_layout;
-#line 980 "/home/jens/Source/shotwell/src/Printing.vala"
-				_vala_assert (_tmp55_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE");
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp56_ = job;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp57_ = print_job_get_local_settings (_tmp56_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp58_ = _tmp57_;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_settings_get_content_width (_tmp58_, &_tmp59_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp59_, MEASUREMENT_UNIT_INCHES, &_tmp60_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp61_ = _tmp60_.value;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_width = _tmp61_;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp58_);
-#line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp62_ = job;
-#line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp63_ = print_job_get_local_settings (_tmp62_);
+					_g_object_unref0 (_tmp110_);
+#line 6916 "Printing.c"
+				}
+			}
+#line 982 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp115_ = self->priv->progress_dialog;
+#line 982 "/home/jens/Source/shotwell/src/Printing.vala"
+			if (_tmp115_ != NULL) {
+#line 6923 "Printing.c"
+				ProgressDialog* _tmp116_ = NULL;
+				gint _tmp117_ = 0;
+				GeeList* _tmp118_ = NULL;
+				gint _tmp119_ = 0;
+				gint _tmp120_ = 0;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp64_ = _tmp63_;
+				_tmp116_ = self->priv->progress_dialog;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_settings_get_content_height (_tmp64_, &_tmp65_);
+				_tmp117_ = page_num;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp65_, MEASUREMENT_UNIT_INCHES, &_tmp66_);
+				_tmp118_ = photos;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp67_ = _tmp66_.value;
+				_tmp119_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_height = _tmp67_;
+				_tmp120_ = _tmp119_;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp64_);
-#line 7038 "Printing.c"
+				progress_dialog_monitor (_tmp116_, (guint64) _tmp117_, (guint64) _tmp120_, TRUE);
+#line 6941 "Printing.c"
 			}
+#line 984 "/home/jens/Source/shotwell/src/Printing.vala"
+			break;
+#line 6945 "Printing.c"
+		}
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
+		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
+#line 6949 "Printing.c"
+		{
+			PrintLayout layout = 0;
+			PrintJob* _tmp121_ = NULL;
+			PrintSettings* _tmp122_ = NULL;
+			PrintSettings* _tmp123_ = NULL;
+			gint _tmp124_ = 0;
+			PrintLayout _tmp125_ = 0;
+			gint nx = 0;
+			PrintLayout _tmp126_ = 0;
+			gint _tmp127_ = 0;
+			gint ny = 0;
+			PrintLayout _tmp128_ = 0;
+			gint _tmp129_ = 0;
+			gint start = 0;
+			gint _tmp130_ = 0;
+			PrintLayout _tmp131_ = 0;
+			gint _tmp132_ = 0;
+			gdouble canvas_width = 0.0;
+			gdouble _tmp133_ = 0.0;
+			gint _tmp134_ = 0;
+			gint _tmp135_ = 0;
+			gdouble canvas_height = 0.0;
+			gdouble _tmp136_ = 0.0;
+			gint _tmp137_ = 0;
+			gint _tmp138_ = 0;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp68_ = page_num;
+			_tmp121_ = job;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp69_ = photos;
+			_tmp122_ = print_job_get_local_settings (_tmp121_);
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp70_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp123_ = _tmp122_;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp71_ = _tmp70_;
+			_tmp124_ = print_settings_get_image_per_page_selection (_tmp123_);
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			if (_tmp68_ < _tmp71_) {
-#line 7050 "Printing.c"
-				Dimensions photo_dimensions = {0};
-				GeeList* _tmp72_ = NULL;
-				gint _tmp73_ = 0;
-				gpointer _tmp74_ = NULL;
-				Photo* _tmp75_ = NULL;
-				Dimensions _tmp76_ = {0};
-				Dimensions _tmp77_ = {0};
-				gdouble photo_aspect_ratio = 0.0;
-				gdouble _tmp78_ = 0.0;
-				gdouble canvas_aspect_ratio = 0.0;
-				gdouble _tmp79_ = 0.0;
-				gdouble _tmp80_ = 0.0;
-				gdouble _tmp81_ = 0.0;
-				gdouble _tmp82_ = 0.0;
-				gdouble _tmp83_ = 0.0;
-				gdouble _tmp84_ = 0.0;
-				gdouble dx = 0.0;
-				gdouble _tmp88_ = 0.0;
-				gdouble _tmp89_ = 0.0;
-				gdouble dy = 0.0;
-				gdouble _tmp90_ = 0.0;
-				gdouble _tmp91_ = 0.0;
-				GeeList* _tmp92_ = NULL;
-				gint _tmp93_ = 0;
-				gpointer _tmp94_ = NULL;
-				Photo* _tmp95_ = NULL;
-				gdouble _tmp96_ = 0.0;
-				gdouble _tmp97_ = 0.0;
-				gdouble _tmp98_ = 0.0;
-				gdouble _tmp99_ = 0.0;
-				PrintJob* _tmp100_ = NULL;
-				GtkPrintContext* _tmp101_ = NULL;
-				PrintJob* _tmp102_ = NULL;
-				PrintSettings* _tmp103_ = NULL;
-				PrintSettings* _tmp104_ = NULL;
-				gboolean _tmp105_ = FALSE;
-				gboolean _tmp106_ = FALSE;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp72_ = photos;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp73_ = page_num;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp74_ = gee_list_get (_tmp72_, _tmp73_);
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp75_ = (Photo*) _tmp74_;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp76_);
+			_tmp125_ = (PrintLayout) _tmp124_;
+#line 987 "/home/jens/Source/shotwell/src/Printing.vala"
+			_print_settings_unref0 (_tmp123_);
+#line 987 "/home/jens/Source/shotwell/src/Printing.vala"
+			layout = _tmp125_;
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp77_ = _tmp76_;
+			_tmp126_ = layout;
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_g_object_unref0 (_tmp75_);
+			_tmp127_ = print_layout_get_x (_tmp126_);
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				photo_dimensions = _tmp77_;
+			nx = _tmp127_;
+#line 989 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp128_ = layout;
 #line 989 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp78_ = dimensions_get_aspect_ratio (&photo_dimensions);
+			_tmp129_ = print_layout_get_y (_tmp128_);
 #line 989 "/home/jens/Source/shotwell/src/Printing.vala"
-				photo_aspect_ratio = _tmp78_;
+			ny = _tmp129_;
+#line 990 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp130_ = page_num;
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp79_ = canvas_width;
+			_tmp131_ = layout;
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp80_ = canvas_height;
+			_tmp132_ = print_layout_get_per_page (_tmp131_);
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_aspect_ratio = ((gdouble) _tmp79_) / _tmp80_;
+			start = _tmp130_ * _tmp132_;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp81_ = canvas_aspect_ratio;
+			_tmp133_ = page_width;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp82_ = floor (_tmp81_);
+			_tmp134_ = nx;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp83_ = photo_aspect_ratio;
+			_tmp135_ = nx;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp84_ = floor (_tmp83_);
-#line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				if (_tmp82_ != _tmp84_) {
-#line 7124 "Printing.c"
-					gdouble canvas_tmp = 0.0;
-					gdouble _tmp85_ = 0.0;
-					gdouble _tmp86_ = 0.0;
-					gdouble _tmp87_ = 0.0;
+			canvas_width = ((gdouble) (_tmp133_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp134_ - 1)))) / _tmp135_;
+#line 992 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp136_ = page_height;
+#line 992 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp137_ = ny;
 #line 992 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp85_ = canvas_width;
+			_tmp138_ = ny;
 #line 992 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_tmp = _tmp85_;
+			canvas_height = ((gdouble) (_tmp136_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp137_ - 1)))) / _tmp138_;
+#line 7025 "Printing.c"
+			{
+				gint y = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+				y = 0;
+#line 7030 "Printing.c"
+				{
+					gboolean _tmp139_ = FALSE;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp139_ = TRUE;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+					while (TRUE) {
+#line 7037 "Printing.c"
+						gint _tmp141_ = 0;
+						gint _tmp142_ = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						if (!_tmp139_) {
+#line 7042 "Printing.c"
+							gint _tmp140_ = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							_tmp140_ = y;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							y = _tmp140_ + 1;
+#line 7048 "Printing.c"
+						}
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp86_ = canvas_height;
+						_tmp139_ = FALSE;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_width = _tmp86_;
+						_tmp141_ = y;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						_tmp142_ = ny;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						if (!(_tmp141_ < _tmp142_)) {
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							break;
+#line 7060 "Printing.c"
+						}
+						{
+							gint x = 0;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp87_ = canvas_tmp;
+							x = 0;
+#line 7066 "Printing.c"
+							{
+								gboolean _tmp143_ = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_height = _tmp87_;
-#line 7141 "Printing.c"
-				}
+								_tmp143_ = TRUE;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+								while (TRUE) {
+#line 7073 "Printing.c"
+									gint _tmp145_ = 0;
+									gint _tmp146_ = 0;
+									gint i = 0;
+									gint _tmp147_ = 0;
+									gint _tmp148_ = 0;
+									gint _tmp149_ = 0;
+									gint _tmp150_ = 0;
+									gint _tmp151_ = 0;
+									GeeList* _tmp152_ = NULL;
+									gint _tmp153_ = 0;
+									gint _tmp154_ = 0;
+									ProgressDialog* _tmp188_ = NULL;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (!_tmp143_) {
+#line 7088 "Printing.c"
+										gint _tmp144_ = 0;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										_tmp144_ = x;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										x = _tmp144_ + 1;
+#line 7094 "Printing.c"
+									}
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp143_ = FALSE;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp145_ = x;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp146_ = nx;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (!(_tmp145_ < _tmp146_)) {
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										break;
+#line 7106 "Printing.c"
+									}
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp147_ = start;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp148_ = y;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp149_ = nx;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp150_ = x;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									i = (_tmp147_ + (_tmp148_ * _tmp149_)) + _tmp150_;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp151_ = i;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp152_ = photos;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp154_ = _tmp153_;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (_tmp151_ < _tmp154_) {
+#line 7128 "Printing.c"
+										gdouble dx = 0.0;
+										gint _tmp155_ = 0;
+										gdouble _tmp156_ = 0.0;
+										gint _tmp157_ = 0;
+										gdouble dy = 0.0;
+										gint _tmp158_ = 0;
+										gdouble _tmp159_ = 0.0;
+										gint _tmp160_ = 0;
+										GeeList* _tmp161_ = NULL;
+										gint _tmp162_ = 0;
+										gpointer _tmp163_ = NULL;
+										Photo* _tmp164_ = NULL;
+										gdouble _tmp165_ = 0.0;
+										gdouble _tmp166_ = 0.0;
+										gdouble _tmp167_ = 0.0;
+										gdouble _tmp168_ = 0.0;
+										PrintJob* _tmp169_ = NULL;
+										GtkPrintContext* _tmp170_ = NULL;
+										PrintJob* _tmp171_ = NULL;
+										PrintSettings* _tmp172_ = NULL;
+										PrintSettings* _tmp173_ = NULL;
+										gboolean _tmp174_ = FALSE;
+										gboolean _tmp175_ = FALSE;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp88_ = page_width;
+										_tmp155_ = x;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp89_ = canvas_width;
+										_tmp156_ = canvas_width;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				dx = (_tmp88_ - _tmp89_) / 2.0;
+										_tmp157_ = x;
+#line 997 "/home/jens/Source/shotwell/src/Printing.vala"
+										dx = (_tmp155_ * _tmp156_) + (_tmp157_ * PRINT_MANAGER_IMAGE_DISTANCE);
+#line 998 "/home/jens/Source/shotwell/src/Printing.vala"
+										_tmp158_ = y;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp90_ = page_height;
+										_tmp159_ = canvas_height;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp91_ = canvas_height;
+										_tmp160_ = y;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				dy = (_tmp90_ - _tmp91_) / 2.0;
+										dy = (_tmp158_ * _tmp159_) + (_tmp160_ * PRINT_MANAGER_IMAGE_DISTANCE);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp92_ = photos;
+										_tmp161_ = photos;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp93_ = page_num;
+										_tmp162_ = i;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp94_ = gee_list_get (_tmp92_, _tmp93_);
+										_tmp163_ = gee_list_get (_tmp161_, _tmp162_);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp95_ = (Photo*) _tmp94_;
+										_tmp164_ = (Photo*) _tmp163_;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp96_ = dx;
+										_tmp165_ = dx;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp97_ = dy;
+										_tmp166_ = dy;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp98_ = canvas_width;
+										_tmp167_ = canvas_width;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp99_ = canvas_height;
+										_tmp168_ = canvas_height;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp100_ = job;
+										_tmp169_ = job;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp101_ = job_context;
+										_tmp170_ = job_context;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_manager_fit_image_to_canvas (self, _tmp95_, _tmp96_, _tmp97_, _tmp98_, _tmp99_, TRUE, _tmp100_, _tmp101_);
+										print_manager_fit_image_to_canvas (self, _tmp164_, _tmp165_, _tmp166_, _tmp167_, _tmp168_, FALSE, _tmp169_, _tmp170_);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_g_object_unref0 (_tmp95_);
+										_g_object_unref0 (_tmp164_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp102_ = job;
+										_tmp171_ = job;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp103_ = print_job_get_local_settings (_tmp102_);
+										_tmp172_ = print_job_get_local_settings (_tmp171_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp104_ = _tmp103_;
+										_tmp173_ = _tmp172_;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp105_ = print_settings_is_print_titles_enabled (_tmp104_);
+										_tmp174_ = print_settings_is_print_titles_enabled (_tmp173_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp106_ = _tmp105_;
+										_tmp175_ = _tmp174_;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp104_);
+										_print_settings_unref0 (_tmp173_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				if (_tmp106_) {
-#line 7193 "Printing.c"
-					gdouble _tmp107_ = 0.0;
-					gdouble _tmp108_ = 0.0;
-					GeeList* _tmp109_ = NULL;
-					gint _tmp110_ = 0;
-					gpointer _tmp111_ = NULL;
-					Photo* _tmp112_ = NULL;
-					gchar* _tmp113_ = NULL;
-					gchar* _tmp114_ = NULL;
-					PrintJob* _tmp115_ = NULL;
-					GtkPrintContext* _tmp116_ = NULL;
+										if (_tmp175_) {
+#line 7206 "Printing.c"
+											gdouble _tmp176_ = 0.0;
+											gdouble _tmp177_ = 0.0;
+											gdouble _tmp178_ = 0.0;
+											gdouble _tmp179_ = 0.0;
+											GeeList* _tmp180_ = NULL;
+											gint _tmp181_ = 0;
+											gpointer _tmp182_ = NULL;
+											Photo* _tmp183_ = NULL;
+											gchar* _tmp184_ = NULL;
+											gchar* _tmp185_ = NULL;
+											PrintJob* _tmp186_ = NULL;
+											GtkPrintContext* _tmp187_ = NULL;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp107_ = page_width;
+											_tmp176_ = dx;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp108_ = page_height;
+											_tmp177_ = canvas_width;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp109_ = photos;
+											_tmp178_ = dy;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp110_ = page_num;
+											_tmp179_ = canvas_height;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp111_ = gee_list_get (_tmp109_, _tmp110_);
+											_tmp180_ = photos;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp112_ = (Photo*) _tmp111_;
+											_tmp181_ = i;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp113_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_OBJECT, DataObject));
+											_tmp182_ = gee_list_get (_tmp180_, _tmp181_);
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp114_ = _tmp113_;
+											_tmp183_ = (Photo*) _tmp182_;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp115_ = job;
+											_tmp184_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, TYPE_DATA_OBJECT, DataObject));
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp116_ = job_context;
+											_tmp185_ = _tmp184_;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					print_manager_add_title_to_canvas (self, _tmp107_ / 2, _tmp108_, _tmp114_, _tmp115_, _tmp116_);
+											_tmp186_ = job;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_g_free0 (_tmp114_);
+											_tmp187_ = job_context;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_g_object_unref0 (_tmp112_);
-#line 7230 "Printing.c"
-				}
-			}
+											print_manager_add_title_to_canvas (self, _tmp176_ + (_tmp177_ / 2), _tmp178_ + _tmp179_, _tmp185_, _tmp186_, _tmp187_);
+#line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
+											_g_free0 (_tmp185_);
+#line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
+											_g_object_unref0 (_tmp183_);
+#line 7249 "Printing.c"
+										}
+									}
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp117_ = self->priv->progress_dialog;
+									_tmp188_ = self->priv->progress_dialog;
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
-			if (_tmp117_ != NULL) {
-#line 7237 "Printing.c"
-				ProgressDialog* _tmp118_ = NULL;
-				gint _tmp119_ = 0;
-				GeeList* _tmp120_ = NULL;
-				gint _tmp121_ = 0;
-				gint _tmp122_ = 0;
+									if (_tmp188_ != NULL) {
+#line 7256 "Printing.c"
+										ProgressDialog* _tmp189_ = NULL;
+										gint _tmp190_ = 0;
+										GeeList* _tmp191_ = NULL;
+										gint _tmp192_ = 0;
+										gint _tmp193_ = 0;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp118_ = self->priv->progress_dialog;
+										_tmp189_ = self->priv->progress_dialog;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp119_ = page_num;
+										_tmp190_ = i;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp120_ = photos;
+										_tmp191_ = photos;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp121_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GEE_TYPE_COLLECTION, GeeCollection));
+										_tmp192_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp191_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp122_ = _tmp121_;
+										_tmp193_ = _tmp192_;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				progress_dialog_monitor (_tmp118_, (guint64) _tmp119_, (guint64) _tmp122_, TRUE);
-#line 7255 "Printing.c"
-			}
-#line 1009 "/home/jens/Source/shotwell/src/Printing.vala"
-			break;
-#line 7259 "Printing.c"
-		}
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
-		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 7263 "Printing.c"
-		{
-			PrintLayout layout = 0;
-			PrintJob* _tmp123_ = NULL;
-			PrintSettings* _tmp124_ = NULL;
-			PrintSettings* _tmp125_ = NULL;
-			gint _tmp126_ = 0;
-			PrintLayout _tmp127_ = 0;
-			gint nx = 0;
-			PrintLayout _tmp128_ = 0;
-			gint _tmp129_ = 0;
-			gint ny = 0;
-			PrintLayout _tmp130_ = 0;
-			gint _tmp131_ = 0;
-			gint start = 0;
-			gint _tmp132_ = 0;
-			PrintLayout _tmp133_ = 0;
-			gint _tmp134_ = 0;
-			gdouble canvas_width = 0.0;
-			gdouble _tmp135_ = 0.0;
-			gint _tmp136_ = 0;
-			gint _tmp137_ = 0;
-			gdouble canvas_height = 0.0;
-			gdouble _tmp138_ = 0.0;
-			gint _tmp139_ = 0;
-			gint _tmp140_ = 0;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp123_ = job;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp124_ = print_job_get_local_settings (_tmp123_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp125_ = _tmp124_;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp126_ = print_settings_get_image_per_page_selection (_tmp125_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp127_ = (PrintLayout) _tmp126_;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_print_settings_unref0 (_tmp125_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			layout = _tmp127_;
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp128_ = layout;
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp129_ = print_layout_get_x (_tmp128_);
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			nx = _tmp129_;
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp130_ = layout;
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp131_ = print_layout_get_y (_tmp130_);
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			ny = _tmp131_;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp132_ = page_num;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp133_ = layout;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp134_ = print_layout_get_per_page (_tmp133_);
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			start = _tmp132_ * _tmp134_;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp135_ = page_width;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp136_ = nx;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp137_ = nx;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			canvas_width = ((gdouble) (_tmp135_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp136_ - 1)))) / _tmp137_;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp138_ = page_height;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp139_ = ny;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp140_ = ny;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			canvas_height = ((gdouble) (_tmp138_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp139_ - 1)))) / _tmp140_;
-#line 7339 "Printing.c"
-			{
-				gint y = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-				y = 0;
-#line 7344 "Printing.c"
-				{
-					gboolean _tmp141_ = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp141_ = TRUE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-					while (TRUE) {
-#line 7351 "Printing.c"
-						gint _tmp143_ = 0;
-						gint _tmp144_ = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						if (!_tmp141_) {
-#line 7356 "Printing.c"
-							gint _tmp142_ = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							_tmp142_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							y = _tmp142_ + 1;
-#line 7362 "Printing.c"
-						}
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp141_ = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp143_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp144_ = ny;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						if (!(_tmp143_ < _tmp144_)) {
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							break;
-#line 7374 "Printing.c"
-						}
-						{
-							gint x = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-							x = 0;
-#line 7380 "Printing.c"
-							{
-								gboolean _tmp145_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-								_tmp145_ = TRUE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-								while (TRUE) {
-#line 7387 "Printing.c"
-									gint _tmp147_ = 0;
-									gint _tmp148_ = 0;
-									gint i = 0;
-									gint _tmp149_ = 0;
-									gint _tmp150_ = 0;
-									gint _tmp151_ = 0;
-									gint _tmp152_ = 0;
-									gint _tmp153_ = 0;
-									GeeList* _tmp154_ = NULL;
-									gint _tmp155_ = 0;
-									gint _tmp156_ = 0;
-									ProgressDialog* _tmp190_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (!_tmp145_) {
-#line 7402 "Printing.c"
-										gint _tmp146_ = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp146_ = x;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										x = _tmp146_ + 1;
-#line 7408 "Printing.c"
-									}
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp145_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp147_ = x;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp148_ = nx;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (!(_tmp147_ < _tmp148_)) {
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										break;
-#line 7420 "Printing.c"
-									}
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp149_ = start;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp150_ = y;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp151_ = nx;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp152_ = x;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									i = (_tmp149_ + (_tmp150_ * _tmp151_)) + _tmp152_;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp153_ = i;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp154_ = photos;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp155_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp156_ = _tmp155_;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (_tmp153_ < _tmp156_) {
-#line 7442 "Printing.c"
-										gdouble dx = 0.0;
-										gint _tmp157_ = 0;
-										gdouble _tmp158_ = 0.0;
-										gint _tmp159_ = 0;
-										gdouble dy = 0.0;
-										gint _tmp160_ = 0;
-										gdouble _tmp161_ = 0.0;
-										gint _tmp162_ = 0;
-										GeeList* _tmp163_ = NULL;
-										gint _tmp164_ = 0;
-										gpointer _tmp165_ = NULL;
-										Photo* _tmp166_ = NULL;
-										gdouble _tmp167_ = 0.0;
-										gdouble _tmp168_ = 0.0;
-										gdouble _tmp169_ = 0.0;
-										gdouble _tmp170_ = 0.0;
-										PrintJob* _tmp171_ = NULL;
-										GtkPrintContext* _tmp172_ = NULL;
-										PrintJob* _tmp173_ = NULL;
-										PrintSettings* _tmp174_ = NULL;
-										PrintSettings* _tmp175_ = NULL;
-										gboolean _tmp176_ = FALSE;
-										gboolean _tmp177_ = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp157_ = x;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp158_ = canvas_width;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp159_ = x;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										dx = (_tmp157_ * _tmp158_) + (_tmp159_ * PRINT_MANAGER_IMAGE_DISTANCE);
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp160_ = y;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp161_ = canvas_height;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp162_ = y;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										dy = (_tmp160_ * _tmp161_) + (_tmp162_ * PRINT_MANAGER_IMAGE_DISTANCE);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp163_ = photos;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp164_ = i;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp165_ = gee_list_get (_tmp163_, _tmp164_);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp166_ = (Photo*) _tmp165_;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp167_ = dx;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp168_ = dy;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp169_ = canvas_width;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp170_ = canvas_height;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp171_ = job;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp172_ = job_context;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										print_manager_fit_image_to_canvas (self, _tmp166_, _tmp167_, _tmp168_, _tmp169_, _tmp170_, FALSE, _tmp171_, _tmp172_);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_g_object_unref0 (_tmp166_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp173_ = job;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp174_ = print_job_get_local_settings (_tmp173_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp175_ = _tmp174_;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp176_ = print_settings_is_print_titles_enabled (_tmp175_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp177_ = _tmp176_;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_print_settings_unref0 (_tmp175_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										if (_tmp177_) {
-#line 7520 "Printing.c"
-											gdouble _tmp178_ = 0.0;
-											gdouble _tmp179_ = 0.0;
-											gdouble _tmp180_ = 0.0;
-											gdouble _tmp181_ = 0.0;
-											GeeList* _tmp182_ = NULL;
-											gint _tmp183_ = 0;
-											gpointer _tmp184_ = NULL;
-											Photo* _tmp185_ = NULL;
-											gchar* _tmp186_ = NULL;
-											gchar* _tmp187_ = NULL;
-											PrintJob* _tmp188_ = NULL;
-											GtkPrintContext* _tmp189_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp178_ = dx;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp179_ = canvas_width;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp180_ = dy;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp181_ = canvas_height;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp182_ = photos;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp183_ = i;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp184_ = gee_list_get (_tmp182_, _tmp183_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp185_ = (Photo*) _tmp184_;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp186_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, TYPE_DATA_OBJECT, DataObject));
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp187_ = _tmp186_;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp188_ = job;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp189_ = job_context;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											print_manager_add_title_to_canvas (self, _tmp178_ + (_tmp179_ / 2), _tmp180_ + _tmp181_, _tmp187_, _tmp188_, _tmp189_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_g_free0 (_tmp187_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_g_object_unref0 (_tmp185_);
-#line 7563 "Printing.c"
-										}
-									}
-#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp190_ = self->priv->progress_dialog;
-#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (_tmp190_ != NULL) {
-#line 7570 "Printing.c"
-										ProgressDialog* _tmp191_ = NULL;
-										gint _tmp192_ = 0;
-										GeeList* _tmp193_ = NULL;
-										gint _tmp194_ = 0;
-										gint _tmp195_ = 0;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp191_ = self->priv->progress_dialog;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp192_ = i;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp193_ = photos;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp194_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp195_ = _tmp194_;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										progress_dialog_monitor (_tmp191_, (guint64) _tmp192_, (guint64) _tmp195_, TRUE);
-#line 7588 "Printing.c"
+										progress_dialog_monitor (_tmp189_, (guint64) _tmp190_, (guint64) _tmp193_, TRUE);
+#line 7274 "Printing.c"
 									}
 								}
 							}
@@ -7593,33 +7279,33 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 					}
 				}
 			}
-#line 1036 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 7598 "Printing.c"
+#line 7284 "Printing.c"
 		}
 		default:
 		{
-#line 1039 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:1039: unknown or unsupported layout mode");
-#line 7604 "Printing.c"
+#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:1014: unknown or unsupported layout mode");
+#line 7290 "Printing.c"
 		}
 	}
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (photos);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (page_setup);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 7615 "Printing.c"
+#line 7301 "Printing.c"
 }
 
 
 static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, GtkWidget* widget, gpointer self) {
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_custom_widget_apply ((PrintManager*) self, widget);
-#line 7622 "Printing.c"
+#line 7308 "Printing.c"
 }
 
 
@@ -7629,31 +7315,31 @@ static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPr
 	CustomPrintTab* _tmp1_ = NULL;
 	GtkPrintOperation* _tmp2_ = NULL;
 	CustomPrintTab* _tmp3_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
-#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GTK_IS_PRINT_OPERATION (emitting_object), NULL);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = custom_print_tab_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_tab);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->custom_tab = _tmp1_;
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = emitting_object;
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PRINT_JOB, PrintJob), gtk_print_operation_get_type (), GtkPrintOperation), "custom-widget-apply", (GCallback) _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply, self);
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->custom_tab;
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject);
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 7656 "Printing.c"
+#line 7342 "Printing.c"
 }
 
 
@@ -7667,41 +7353,41 @@ static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget*
 	PrintSettings* _tmp5_ = NULL;
 	PrintSettings* _tmp6_ = NULL;
 	PrintSettings* _tmp7_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_WIDGET (custom_widget));
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = custom_widget;
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab));
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	tab = _tmp1_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = custom_print_tab_get_source_job (tab);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_get_local_settings (tab);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_job_set_local_settings (_tmp3_, _tmp5_);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp5_);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = custom_print_tab_get_local_settings (tab);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = _tmp6_;
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_set_global_settings (self, _tmp7_);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp7_);
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (tab);
-#line 7704 "Printing.c"
+#line 7390 "Printing.c"
 }
 
 
@@ -7748,61 +7434,61 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 	gint _tmp41_ = 0;
 	cairo_t* _tmp96_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job_context;
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp2_;
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = photo;
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_dimensions = _tmp4_;
-#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = dimensions_get_aspect_ratio (&photo_dimensions);
-#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_aspect_ratio = _tmp5_;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = canvas_width;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = canvas_height;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	canvas_aspect_ratio = ((gdouble) _tmp6_) / _tmp7_;
-#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Printing.vala"
 	target_width = 0.0;
-#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Printing.vala"
 	target_height = 0.0;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = job;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_settings_get_content_ppi (_tmp10_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = (gdouble) _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp12_;
-#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = crop;
-#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!_tmp13_) {
-#line 7805 "Printing.c"
+#line 7491 "Printing.c"
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp15_ = 0.0;
 		gdouble _tmp22_ = 0.0;
@@ -7811,133 +7497,133 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		gdouble _tmp25_ = 0.0;
 		gdouble _tmp26_ = 0.0;
 		gdouble _tmp27_ = 0.0;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = canvas_aspect_ratio;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp15_ = photo_aspect_ratio;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp14_ < _tmp15_) {
-#line 7820 "Printing.c"
+#line 7506 "Printing.c"
 			gdouble _tmp16_ = 0.0;
 			gdouble _tmp17_ = 0.0;
 			gdouble _tmp18_ = 0.0;
-#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp16_ = canvas_width;
-#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_width = _tmp16_;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp17_ = target_width;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp18_ = photo_aspect_ratio;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_height = _tmp17_ * (1.0 / _tmp18_);
-#line 7834 "Printing.c"
+#line 7520 "Printing.c"
 		} else {
 			gdouble _tmp19_ = 0.0;
 			gdouble _tmp20_ = 0.0;
 			gdouble _tmp21_ = 0.0;
-#line 1070 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp19_ = canvas_height;
-#line 1070 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_height = _tmp19_;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp20_ = target_height;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp21_ = photo_aspect_ratio;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_width = _tmp20_ * _tmp21_;
-#line 7849 "Printing.c"
+#line 7535 "Printing.c"
 		}
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = x;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = canvas_width;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = target_width;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		x = _tmp22_ + ((_tmp23_ - _tmp24_) / 2.0);
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = y;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = canvas_height;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = target_height;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		y = _tmp25_ + ((_tmp26_ - _tmp27_) / 2.0);
-#line 7867 "Printing.c"
+#line 7553 "Printing.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = dpi;
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp29_ = x;
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	x_offset = _tmp28_ * _tmp29_;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp30_ = dpi;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = y;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	y_offset = _tmp30_ * _tmp31_;
-#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = dc;
-#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_save (_tmp32_);
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = dc;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp34_ = x_offset;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp35_ = y_offset;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_translate (_tmp33_, _tmp34_, _tmp35_);
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp36_ = dpi;
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp37_ = canvas_width;
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	w = (gint) (_tmp36_ * _tmp37_);
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp38_ = dpi;
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = canvas_height;
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	h = (gint) (_tmp38_ * _tmp39_);
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = w;
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = h;
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	dimensions_init (&viewport, _tmp40_, _tmp41_);
-#line 7911 "Printing.c"
+#line 7597 "Printing.c"
 	{
 		gboolean _tmp42_ = FALSE;
 		gboolean _tmp43_ = FALSE;
 		cairo_t* _tmp89_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp43_ = crop;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp43_) {
-#line 7920 "Printing.c"
+#line 7606 "Printing.c"
 			gdouble _tmp44_ = 0.0;
 			gdouble _tmp45_ = 0.0;
 			gboolean _tmp46_ = FALSE;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp44_ = canvas_aspect_ratio;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp45_ = photo_aspect_ratio;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp46_ = print_manager_are_approximately_equal (self, _tmp44_, _tmp45_);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = !_tmp46_;
-#line 7932 "Printing.c"
+#line 7618 "Printing.c"
 		} else {
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = FALSE;
-#line 7936 "Printing.c"
+#line 7622 "Printing.c"
 		}
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp42_) {
-#line 7940 "Printing.c"
+#line 7626 "Printing.c"
 			Scaling pixbuf_scaling = {0};
 			Dimensions _tmp47_ = {0};
 			Scaling _tmp48_ = {0};
@@ -7967,121 +7653,121 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			GdkPixbuf* _tmp77_ = NULL;
 			cairo_t* _tmp78_ = NULL;
 			GdkPixbuf* _tmp79_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp47_ = viewport;
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaling_to_fill_viewport (&_tmp47_, &_tmp48_);
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			pixbuf_scaling = _tmp48_;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp49_ = photo;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp50_ = pixbuf_scaling;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp51_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp50_, &_inner_error_);
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp51_;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7986 "Printing.c"
-				goto __catch468_g_error;
+#line 7672 "Printing.c"
+				goto __catch469_g_error;
 			}
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			dimensions_for_pixbuf (_tmp52_, &_tmp53_);
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaled_photo_dimensions = _tmp53_;
-#line 1091 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
 			shave_vertical = 0;
-#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
 			shave_horizontal = 0;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp54_ = canvas_aspect_ratio;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp55_ = photo_aspect_ratio;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp54_ < _tmp55_) {
-#line 8005 "Printing.c"
+#line 7691 "Printing.c"
 				Dimensions _tmp56_ = {0};
 				gint _tmp57_ = 0;
 				Dimensions _tmp58_ = {0};
 				gint _tmp59_ = 0;
 				gdouble _tmp60_ = 0.0;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp56_ = scaled_photo_dimensions;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp57_ = _tmp56_.width;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp58_ = scaled_photo_dimensions;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp59_ = _tmp58_.height;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp60_ = canvas_aspect_ratio;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_vertical = (gint) ((_tmp57_ - (_tmp59_ * _tmp60_)) / 2.0);
-#line 8023 "Printing.c"
+#line 7709 "Printing.c"
 			} else {
 				Dimensions _tmp61_ = {0};
 				gint _tmp62_ = 0;
 				Dimensions _tmp63_ = {0};
 				gint _tmp64_ = 0;
 				gdouble _tmp65_ = 0.0;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp61_ = scaled_photo_dimensions;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp62_ = _tmp61_.height;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp63_ = scaled_photo_dimensions;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp64_ = _tmp63_.width;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp65_ = canvas_aspect_ratio;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_horizontal = (gint) ((_tmp62_ - (_tmp64_ * (1.0 / _tmp65_))) / 2.0);
-#line 8042 "Printing.c"
+#line 7728 "Printing.c"
 			}
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp66_ = photo_pixbuf;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp67_ = shave_vertical;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp68_ = shave_horizontal;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp69_ = scaled_photo_dimensions;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp70_ = _tmp69_.width;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp71_ = shave_vertical;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp72_ = scaled_photo_dimensions;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp73_ = _tmp72_.height;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp74_ = shave_horizontal;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp75_ = gdk_pixbuf_new_subpixbuf (_tmp66_, _tmp67_, _tmp68_, _tmp70_ - (2 * _tmp71_), _tmp73_ - (2 * _tmp74_));
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			shaved_pixbuf = _tmp75_;
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp76_ = shaved_pixbuf;
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp77_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp76_, GDK_INTERP_HYPER, TRUE);
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp77_;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp78_ = dc;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp79_ = photo_pixbuf;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			gdk_cairo_set_source_pixbuf (_tmp78_, _tmp79_, 0.0, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (shaved_pixbuf);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 8084 "Printing.c"
+#line 7770 "Printing.c"
 		} else {
 			Scaling pixbuf_scaling = {0};
 			Dimensions _tmp80_ = {0};
@@ -8094,51 +7780,51 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			GdkPixbuf* _tmp86_ = NULL;
 			cairo_t* _tmp87_ = NULL;
 			GdkPixbuf* _tmp88_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp80_ = viewport;
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaling_for_viewport (&_tmp80_, TRUE, &_tmp81_);
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			pixbuf_scaling = _tmp81_;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp82_ = photo;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp83_ = pixbuf_scaling;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp84_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp83_, &_inner_error_);
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp84_;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8113 "Printing.c"
-				goto __catch468_g_error;
+#line 7799 "Printing.c"
+				goto __catch469_g_error;
 			}
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp86_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp85_, GDK_INTERP_HYPER, TRUE);
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp86_;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp87_ = dc;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp88_ = photo_pixbuf;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			gdk_cairo_set_source_pixbuf (_tmp87_, _tmp88_, 0.0, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 8132 "Printing.c"
+#line 7818 "Printing.c"
 		}
-#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp89_ = dc;
-#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		cairo_paint (_tmp89_);
-#line 8138 "Printing.c"
+#line 7824 "Printing.c"
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally469;
+	__catch469_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_ = NULL;
@@ -8147,59 +7833,59 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		const gchar* _tmp93_ = NULL;
 		gchar* _tmp94_ = NULL;
 		gchar* _tmp95_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_inner_error_ = NULL;
-#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp90_ = job;
-#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp91_ = _ ("Unable to print photo:\n\n%s");
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp92_ = e;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp93_ = _tmp92_->message;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp94_ = g_strdup_printf (_tmp91_, _tmp93_);
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp95_ = _tmp94_;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		app_window_error_message (_tmp95_, NULL);
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp95_);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 8174 "Printing.c"
+#line 7860 "Printing.c"
 	}
-	__finally468:
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+	__finally469:
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_cairo_destroy0 (dc);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_critical ("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 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_clear_error (&_inner_error_);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 8187 "Printing.c"
+#line 7873 "Printing.c"
 	}
-#line 1114 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp96_ = dc;
-#line 1114 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_restore (_tmp96_);
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 8195 "Printing.c"
+#line 7881 "Printing.c"
 }
 
 
 static void _vala_PangoFontDescription_free (PangoFontDescription* self) {
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_boxed_free (pango_font_description_get_type (), self);
-#line 8202 "Printing.c"
+#line 7888 "Printing.c"
 }
 
 
@@ -8236,115 +7922,115 @@ static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gd
 	gdouble _tmp21_ = 0.0;
 	gdouble ty = 0.0;
 	gdouble _tmp22_ = 0.0;
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (title != NULL);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job_context;
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp2_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = job;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = print_job_get_local_settings (_tmp3_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = print_settings_get_content_ppi (_tmp5_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = (gdouble) _tmp6_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp5_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp7_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = job;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_settings_get_print_titles_font (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = pango_font_description_from_string (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = _tmp13_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_font_description = _tmp14_;
-#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = pango_cairo_create_layout (dc);
-#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_layout = _tmp15_;
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = pango_layout_get_context (title_layout);
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	context = _tmp17_;
-#line 1123 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_cairo_context_set_resolution (context, dpi);
-#line 1124 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_set_font_description (title_layout, title_font_description);
-#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = title;
-#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_set_text (title_layout, _tmp18_, -1);
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_get_pixel_size (title_layout, &_tmp19_, &_tmp20_);
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_width = _tmp19_;
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_height = _tmp20_;
-#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21_ = x;
-#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
 	tx = (dpi * _tmp21_) - (title_width / 2);
-#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp22_ = y;
-#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 	ty = (dpi * _tmp22_) - title_height;
-#line 1132 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_rectangle (dc, tx - 10, ty + 2, (gdouble) (title_width + 20), (gdouble) title_height);
-#line 1133 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 1, (gdouble) 1, (gdouble) 1, (gdouble) 1);
-#line 1134 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_line_width (dc, (gdouble) 2);
-#line 1135 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_stroke_preserve (dc);
-#line 1136 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 1, (gdouble) 1, (gdouble) 1, 0.5);
-#line 1137 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_fill (dc);
-#line 1138 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 0, (gdouble) 0, (gdouble) 0, (gdouble) 1);
-#line 1140 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_move_to (dc, tx, ty + 2);
-#line 1141 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_cairo_show_layout (dc, title_layout);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (context);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (title_layout);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	__vala_PangoFontDescription_free0 (title_font_description);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 8347 "Printing.c"
+#line 8033 "Printing.c"
 }
 
 
@@ -8354,21 +8040,21 @@ static gboolean print_manager_are_approximately_equal (PrintManager* self, gdoub
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 1144 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), FALSE);
-#line 1145 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
 	accept_err = 0.005;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = val1;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = val2;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = fabs (_tmp0_ - _tmp1_);
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_ <= accept_err;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8371 "Printing.c"
+#line 8057 "Printing.c"
 }
 
 
@@ -8376,17 +8062,17 @@ PrintSettings* print_manager_get_global_settings (PrintManager* self) {
 	PrintSettings* result = NULL;
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->settings;
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8389 "Printing.c"
+#line 8075 "Printing.c"
 }
 
 
@@ -8394,247 +8080,255 @@ void print_manager_set_global_settings (PrintManager* self, PrintSettings* setti
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
 	PrintSettings* _tmp2_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1153 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (settings));
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = settings;
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 1155 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = settings;
-#line 1155 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_save (_tmp2_);
-#line 8413 "Printing.c"
+#line 8099 "Printing.c"
 }
 
 
 static void value_print_manager_init (GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8420 "Printing.c"
+#line 8106 "Printing.c"
 }
 
 
 static void value_print_manager_free_value (GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (value->data[0].v_pointer);
-#line 8429 "Printing.c"
+#line 8115 "Printing.c"
 	}
 }
 
 
 static void value_print_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = print_manager_ref (src_value->data[0].v_pointer);
-#line 8439 "Printing.c"
+#line 8125 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8443 "Printing.c"
+#line 8129 "Printing.c"
 	}
 }
 
 
 static gpointer value_print_manager_peek_pointer (const GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8451 "Printing.c"
+#line 8137 "Printing.c"
 }
 
 
 static gchar* value_print_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8458 "Printing.c"
+#line 8144 "Printing.c"
 		PrintManager* object;
 		object = collect_values[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8465 "Printing.c"
+#line 8151 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8469 "Printing.c"
+#line 8155 "Printing.c"
 		}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = print_manager_ref (object);
-#line 8473 "Printing.c"
+#line 8159 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8477 "Printing.c"
+#line 8163 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8481 "Printing.c"
+#line 8167 "Printing.c"
 }
 
 
 static gchar* value_print_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PrintManager** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8492 "Printing.c"
+#line 8178 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 8498 "Printing.c"
+#line 8184 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8502 "Printing.c"
+#line 8188 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = print_manager_ref (value->data[0].v_pointer);
-#line 8506 "Printing.c"
+#line 8192 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8510 "Printing.c"
+#line 8196 "Printing.c"
 }
 
 
 GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPrintManager* spec;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PRINT_MANAGER), NULL);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8524 "Printing.c"
+#line 8210 "Printing.c"
 }
 
 
 gpointer value_get_print_manager (const GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER), NULL);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8533 "Printing.c"
+#line 8219 "Printing.c"
 }
 
 
 void value_set_print_manager (GValue* value, gpointer v_object) {
 	PrintManager* old;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_ref (value->data[0].v_pointer);
-#line 8553 "Printing.c"
+#line 8239 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8557 "Printing.c"
+#line 8243 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8563 "Printing.c"
+#line 8249 "Printing.c"
 	}
 }
 
 
 void value_take_print_manager (GValue* value, gpointer v_object) {
 	PrintManager* old;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8582 "Printing.c"
+#line 8268 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8586 "Printing.c"
+#line 8272 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8592 "Printing.c"
+#line 8278 "Printing.c"
 	}
 }
 
 
 static void print_manager_class_init (PrintManagerClass * klass) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_parent_class = g_type_class_peek_parent (klass);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	((PrintManagerClass *) klass)->finalize = print_manager_finalize;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintManagerPrivate));
-#line 8604 "Printing.c"
+#line 8290 "Printing.c"
 }
 
 
 static void print_manager_instance_init (PrintManager * self) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = PRINT_MANAGER_GET_PRIVATE (self);
-#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = NULL;
-#line 808 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 780 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = NULL;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes = NULL;
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes_length1 = 0;
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1;
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 8617 "Printing.c"
+#line 8309 "Printing.c"
 }
 
 
 static void print_manager_finalize (PrintManager* obj) {
 	PrintManager * self;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_MANAGER, PrintManager);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_handlers_destroy (self);
-#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 776 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 805 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 777 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->user_page_setup);
-#line 806 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 778 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_tab);
-#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 808 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 780 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 8637 "Printing.c"
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 8331 "Printing.c"
 }
 
 
@@ -8655,24 +8349,24 @@ GType print_manager_get_type (void) {
 gpointer print_manager_ref (gpointer instance) {
 	PrintManager* self;
 	self = instance;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 8662 "Printing.c"
+#line 8356 "Printing.c"
 }
 
 
 void print_manager_unref (gpointer instance) {
 	PrintManager* self;
 	self = instance;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		PRINT_MANAGER_GET_CLASS (self)->finalize (self);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8675 "Printing.c"
+#line 8369 "Printing.c"
 	}
 }
 
diff --git a/src/Printing.vala b/src/Printing.vala
index d5a84e5..988a456 100644
--- a/src/Printing.vala
+++ b/src/Printing.vala
@@ -265,23 +265,36 @@ private enum PrintLayout {
     }
 }
 
-public class CustomPrintTab : Gtk.Fixed {
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/printing_widget.ui")]
+public class CustomPrintTab : Gtk.Box {
     private const int INCHES_COMBO_CHOICE = 0;
     private const int CENTIMETERS_COMBO_CHOICE = 1;
 
-    private Gtk.Box custom_image_settings_pane = null;
-    private Gtk.RadioButton standard_size_radio = null;
-    private Gtk.RadioButton custom_size_radio = null;
-    private Gtk.RadioButton image_per_page_radio = null;
-    private Gtk.ComboBox image_per_page_combo = null;
-    private Gtk.ComboBox standard_sizes_combo = null;
-    private Gtk.ComboBoxText units_combo = null;
-    private Gtk.Entry custom_width_entry = null;
-    private Gtk.Entry custom_height_entry = null;
+    [GtkChild]
+    private Gtk.RadioButton standard_size_radio;
+    [GtkChild]
+    private Gtk.RadioButton custom_size_radio;
+    [GtkChild]
+    private Gtk.RadioButton image_per_page_radio;
+    [GtkChild]
+    private Gtk.ComboBoxText image_per_page_combo;
+    [GtkChild]
+    private Gtk.ComboBoxText standard_sizes_combo;
+    [GtkChild]
+    private Gtk.ComboBoxText units_combo;
+    [GtkChild]
+    private Gtk.Entry custom_width_entry;
+    [GtkChild]
+    private Gtk.Entry custom_height_entry;
+    [GtkChild]
     private Gtk.Entry ppi_entry;
-    private Gtk.CheckButton aspect_ratio_check = null;
-    private Gtk.CheckButton title_print_check = null;
-    private Gtk.FontButton title_print_font = null;
+    [GtkChild]
+    private Gtk.CheckButton aspect_ratio_check;
+    [GtkChild]
+    private Gtk.CheckButton title_print_check;
+    [GtkChild]
+    private Gtk.FontButton title_print_font;
+
     private Measurement local_content_width = Measurement(5.0, MeasurementUnit.INCHES);
     private Measurement local_content_height = Measurement(5.0, MeasurementUnit.INCHES);
     private int local_content_ppi;
@@ -290,76 +303,35 @@ public class CustomPrintTab : Gtk.Fixed {
 
     public CustomPrintTab(PrintJob source_job) {
         this.source_job = source_job;
-        Gtk.Builder builder = AppWindow.create_builder();
-
-        // an enclosing box for every widget on this tab...
-        custom_image_settings_pane = builder.get_object("box_ImgSettingsPane") as Gtk.Box;
 
-        standard_size_radio = builder.get_object("radio_UseStandardSize") as Gtk.RadioButton;
         standard_size_radio.clicked.connect(on_radio_group_click);
-        
-        custom_size_radio = builder.get_object("radio_UseCustomSize") as Gtk.RadioButton;
         custom_size_radio.clicked.connect(on_radio_group_click);
-
-        image_per_page_radio = builder.get_object("radio_Autosize") as Gtk.RadioButton;
         image_per_page_radio.clicked.connect(on_radio_group_click);
 
-        image_per_page_combo = builder.get_object("combo_Autosize") as Gtk.ComboBox;
-        Gtk.CellRendererText image_per_page_combo_text_renderer =
-            new Gtk.CellRendererText();
-        image_per_page_combo.pack_start(image_per_page_combo_text_renderer, true);
-        image_per_page_combo.add_attribute(image_per_page_combo_text_renderer,
-            "text", 0);
-        Gtk.ListStore image_per_page_combo_store = new Gtk.ListStore(2, typeof(string),
-            typeof(string));
         foreach (PrintLayout layout in PrintLayout.get_all()) {
-            Gtk.TreeIter iter;
-            image_per_page_combo_store.append(out iter);
-            image_per_page_combo_store.set_value(iter, 0, layout.to_string());
+            image_per_page_combo.append_text(layout.to_string());
         }
-        image_per_page_combo.set_model(image_per_page_combo_store);
-
-        StandardPrintSize[] standard_sizes = PrintManager.get_instance().get_standard_sizes();
-        standard_sizes_combo = builder.get_object("combo_StdSizes") as Gtk.ComboBox;
-        Gtk.CellRendererText standard_sizes_combo_text_renderer =
-            new Gtk.CellRendererText();
-        standard_sizes_combo.pack_start(standard_sizes_combo_text_renderer, true);
-        standard_sizes_combo.add_attribute(standard_sizes_combo_text_renderer,
-            "text", 0);
+
+        unowned StandardPrintSize[] standard_sizes = PrintManager.get_instance().get_standard_sizes();
         standard_sizes_combo.set_row_separator_func(standard_sizes_combo_separator_func);
-        Gtk.ListStore standard_sizes_combo_store = new Gtk.ListStore(1, typeof(string),
-            typeof(string));
         foreach (StandardPrintSize size in standard_sizes) {
-            Gtk.TreeIter iter;
-            standard_sizes_combo_store.append(out iter);
-            standard_sizes_combo_store.set_value(iter, 0, size.name);
+            standard_sizes_combo.append_text(size.name);
         }
-        standard_sizes_combo.set_model(standard_sizes_combo_store);
 
-        custom_width_entry = builder.get_object("entry_CustomWidth") as Gtk.Entry;
+        standard_sizes_combo.set_active(9 * Resources.get_default_measurement_unit());
+
         custom_width_entry.insert_text.connect(on_entry_insert_text);
         custom_width_entry.focus_out_event.connect(on_width_entry_focus_out);
 
-        custom_height_entry = builder.get_object("entry_CustomHeight") as Gtk.Entry;
         custom_height_entry.insert_text.connect(on_entry_insert_text);
         custom_height_entry.focus_out_event.connect(on_height_entry_focus_out);
 
-        units_combo = builder.get_object("combo_Units") as Gtk.ComboBoxText;
-        units_combo.append_text(_("in."));
-        units_combo.append_text(_("cm"));
-        units_combo.set_active(0);
         units_combo.changed.connect(on_units_combo_changed);
+        units_combo.set_active(Resources.get_default_measurement_unit());
 
-        aspect_ratio_check = builder.get_object("check_MatchAspectRatio") as Gtk.CheckButton;
-        title_print_check = builder.get_object("check_PrintImageTitle") as Gtk.CheckButton;
-        title_print_font = builder.get_object("fntbn_TitleFont") as Gtk.FontButton;
-
-        ppi_entry = builder.get_object("entry_PixelsPerInch") as Gtk.Entry;
         ppi_entry.insert_text.connect(on_ppi_entry_insert_text);
         ppi_entry.focus_out_event.connect(on_ppi_entry_focus_out);
 
-        this.add(custom_image_settings_pane);
-
         sync_state_from_job(source_job);
 
         show_all();
@@ -613,7 +585,7 @@ public class CustomPrintTab : Gtk.Fixed {
         Value val;
         model.get_value(iter, 0, out val);
 
-        return (val.dup_string() == "-");
+        return (val.get_string() == "-");
     }
 
     private void set_content_layout(ContentLayout content_layout) {
@@ -806,62 +778,65 @@ public class PrintManager {
     private CustomPrintTab custom_tab;
     private ProgressDialog? progress_dialog = null;
     private Cancellable? cancellable = null;
+    private StandardPrintSize[] standard_sizes = null;
     
     private PrintManager() {
         user_page_setup = new Gtk.PageSetup();
         settings = new PrintSettings();
     }
 
-    public StandardPrintSize[] get_standard_sizes() {
-        StandardPrintSize[] result = new StandardPrintSize[0];
-
-        result += new StandardPrintSize(_("Wallet (2 × 3 in.)"),
-            Measurement(3, MeasurementUnit.INCHES),
-            Measurement(2, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("Notecard (3 × 5 in.)"),
-            Measurement(5, MeasurementUnit.INCHES),
-            Measurement(3, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("4 × 6 in."),
-            Measurement(6, MeasurementUnit.INCHES),
-            Measurement(4, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("5 × 7 in."),
-            Measurement(7, MeasurementUnit.INCHES),
-            Measurement(5, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("8 × 10 in."),
-            Measurement(10, MeasurementUnit.INCHES),
-            Measurement(8, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("11 × 14 in."),
-            Measurement(14, MeasurementUnit.INCHES),
-            Measurement(11, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("16 × 20 in."),
-            Measurement(20, MeasurementUnit.INCHES),
-            Measurement(16, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(("-"),
-            Measurement(0, MeasurementUnit.INCHES),
-            Measurement(0, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("Metric Wallet (9 × 13 cm)"),
-            Measurement(13, MeasurementUnit.CENTIMETERS),
-            Measurement(9, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("Postcard (10 × 15 cm)"),
-            Measurement(15, MeasurementUnit.CENTIMETERS),
-            Measurement(10, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("13 × 18 cm"),
-            Measurement(18, MeasurementUnit.CENTIMETERS),
-            Measurement(13, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("18 × 24 cm"),
-            Measurement(24, MeasurementUnit.CENTIMETERS),
-            Measurement(18, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("20 × 30 cm"),
-            Measurement(30, MeasurementUnit.CENTIMETERS),
-            Measurement(20, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("24 × 40 cm"),
-            Measurement(40, MeasurementUnit.CENTIMETERS),
-            Measurement(24, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("30 × 40 cm"),
-            Measurement(40, MeasurementUnit.CENTIMETERS),
-            Measurement(30, MeasurementUnit.CENTIMETERS));
+    public unowned StandardPrintSize[] get_standard_sizes() {
+        if (standard_sizes == null) {
+            standard_sizes = new StandardPrintSize[0];
+
+            standard_sizes += new StandardPrintSize(_("Wallet (2 × 3 in.)"),
+                    Measurement(3, MeasurementUnit.INCHES),
+                    Measurement(2, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("Notecard (3 × 5 in.)"),
+                    Measurement(5, MeasurementUnit.INCHES),
+                    Measurement(3, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("4 × 6 in."),
+                    Measurement(6, MeasurementUnit.INCHES),
+                    Measurement(4, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("5 × 7 in."),
+                    Measurement(7, MeasurementUnit.INCHES),
+                    Measurement(5, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("8 × 10 in."),
+                    Measurement(10, MeasurementUnit.INCHES),
+                    Measurement(8, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("11 × 14 in."),
+                    Measurement(14, MeasurementUnit.INCHES),
+                    Measurement(11, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("16 × 20 in."),
+                    Measurement(20, MeasurementUnit.INCHES),
+                    Measurement(16, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(("-"),
+                    Measurement(0, MeasurementUnit.INCHES),
+                    Measurement(0, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("Metric Wallet (9 × 13 cm)"),
+                    Measurement(13, MeasurementUnit.CENTIMETERS),
+                    Measurement(9, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("Postcard (10 × 15 cm)"),
+                    Measurement(15, MeasurementUnit.CENTIMETERS),
+                    Measurement(10, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("13 × 18 cm"),
+                    Measurement(18, MeasurementUnit.CENTIMETERS),
+                    Measurement(13, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("18 × 24 cm"),
+                    Measurement(24, MeasurementUnit.CENTIMETERS),
+                    Measurement(18, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("20 × 30 cm"),
+                    Measurement(30, MeasurementUnit.CENTIMETERS),
+                    Measurement(20, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("24 × 40 cm"),
+                    Measurement(40, MeasurementUnit.CENTIMETERS),
+                    Measurement(24, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("30 × 40 cm"),
+                    Measurement(40, MeasurementUnit.CENTIMETERS),
+                    Measurement(30, MeasurementUnit.CENTIMETERS));
+        }
 
-        return result;
+        return standard_sizes;
     }
 
     public static PrintManager get_instance() {
diff --git a/src/Properties.c b/src/Properties.c
index 4acfb1b..eee82c8 100644
--- a/src/Properties.c
+++ b/src/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 __catch433_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 __finally433;
+		__catch433_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:
+		__finally433:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4840,7 +4840,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4843 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch434_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -4865,7 +4865,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4868 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch434_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4891,8 +4891,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 4893 "Properties.c"
 	}
-	goto __finally433;
-	__catch433_g_regex_error:
+	goto __finally434;
+	__catch434_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4905,7 +4905,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 4907 "Properties.c"
 	}
-	__finally433:
+	__finally434:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/Resources.c b/src/Resources.c
index 1682cda..dd4b18c 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -18,9 +18,9 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gee.h>
 #include <gtk/gtk.h>
-#include <gio/gio.h>
 #include <locale.h>
 #include <langinfo.h>
+#include <gio/gio.h>
 #include <gdk/gdk.h>
 
 #define _g_free0(var) (var = (g_free (var), NULL))
@@ -29,6 +29,8 @@
 
 #define TYPE_RATING_FILTER (rating_filter_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 typedef enum  {
@@ -59,6 +61,12 @@ typedef enum  {
 	RATING_FILTER_FIVE_ONLY = 14
 } RatingFilter;
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 
 extern gchar* resources_RATE_ONE_LABEL;
 extern gchar* resources_RATE_TWO_LABEL;
@@ -148,6 +156,10 @@ extern gchar* resources_START_MULTIMONTH_DATE_FORMAT_STRING;
 gchar* resources_START_MULTIMONTH_DATE_FORMAT_STRING = NULL;
 extern gchar* resources_END_MULTIMONTH_DATE_FORMAT_STRING;
 gchar* resources_END_MULTIMONTH_DATE_FORMAT_STRING = NULL;
+extern gchar* resources_lc_measurement;
+gchar* resources_lc_measurement = NULL;
+extern ResourcesUnitSystem resources_unit_system;
+ResourcesUnitSystem resources_unit_system = RESOURCES_UNIT_SYSTEM_UNKNOWN;
 extern GdkPixbuf* resources_noninterpretable_badge_pixbuf;
 GdkPixbuf* resources_noninterpretable_badge_pixbuf = NULL;
 extern GeeMap* resources_providers;
@@ -209,7 +221,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_MERGE "shotwell-merge-events"
 #define RESOURCES_GO_NEXT "go-next"
 #define RESOURCES_GO_PREVIOUS "go-previous"
-#define RESOURCES_ICON_ABOUT_LOGO "shotwell-street.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.jpg"
 #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
 #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point"
 #define RESOURCES_ICON_RATING_REJECTED "rejected.svg"
@@ -448,9 +460,12 @@ gchar* resources_jump_to_file_failed (GError* err);
 #define RESOURCES_SELECT_ALL_MENU _ ("Select _All")
 #define RESOURCES_SELECT_ALL_TOOLTIP _ ("Select all items")
 void resources_init (void);
-GFile* app_dirs_get_resources_dir (void);
+GtkIconTheme* resources_get_icon_theme_engine (void);
 void resources_terminate (void);
 void resources_fetch_lc_time_format (void);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
+static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle);
 gchar* resources_get_hh_mm_format_string (void);
 gchar* resources_get_hh_mm_ss_format_string (void);
 gchar* resources_get_long_date_format_string (void);
@@ -458,10 +473,9 @@ gchar* resources_get_start_multiday_span_format_string (void);
 gchar* resources_get_end_multiday_span_format_string (void);
 gchar* resources_get_start_multimonth_span_format_string (void);
 gchar* resources_get_end_multimonth_span_format_string (void);
-GFile* resources_get_ui (const gchar* filename);
+gchar* resources_get_ui (const gchar* filename);
 #define RESOURCES_NONINTERPRETABLE_BADGE_FILE "noninterpretable-video.png"
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
-GtkIconTheme* resources_get_icon_theme_engine (void);
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
 GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
 gchar* resources_get_help_path (void);
@@ -483,9 +497,11 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet);
 #define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)"
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static gint _vala_array_length (gpointer array);
 
 const gchar* RESOURCES_AUTHORS[6] = {"Jim Nelson <jim@yorba.org>", "Lucas Beeler <lucas@yorba.org>", "Allison Barlow <allison@yorba.org>", "Eric Gregory <eric@yorba.org>", "Clinton Rogers <clinton@yorba.org>", NULL};
 const gint RESOURCES_rating_thresholds[6] = {0, 1, 25, 50, 75, 99};
+const gchar* RESOURCES_IMPERIAL_COUNTRIES[4] = {"unm_US", "es_US", "en_US", "yi_US"};
 
 gchar* resources_launch_editor_failed (GError* err) {
 	gchar* result = NULL;
@@ -493,19 +509,19 @@ gchar* resources_launch_editor_failed (GError* err) {
 	GError* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to launch editor: %s");
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = err;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_->message;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 481 "Resources.c"
+#line 497 "Resources.c"
 }
 
 
@@ -513,13 +529,13 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	gchar* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = names;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0__length1 = names_length1;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 495 "Resources.c"
+#line 511 "Resources.c"
 		const gchar* _tmp1_ = NULL;
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
@@ -528,39 +544,39 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = _ ("Add Tag “%s”");
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = names;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2__length1 = names_length1;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = _tmp2_[0];
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = hierarchical_tag_utilities_get_basename (_tmp3_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = _tmp4_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_strdup_printf (_tmp1_, _tmp5_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = _tmp6_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp5_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = _tmp7_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 526 "Resources.c"
+#line 542 "Resources.c"
 	} else {
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = names;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8__length1 = names_length1;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp8__length1 == 2) {
-#line 536 "Resources.c"
+#line 552 "Resources.c"
 			const gchar* _tmp9_ = NULL;
 			gchar** _tmp10_ = NULL;
 			gint _tmp10__length1 = 0;
@@ -574,53 +590,53 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = _ ("Add Tags “%s” and “%s”");
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = names;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10__length1 = names_length1;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = _tmp10_[0];
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = hierarchical_tag_utilities_get_basename (_tmp11_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = _tmp12_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = names;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14__length1 = names_length1;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = _tmp14_[1];
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp16_ = hierarchical_tag_utilities_get_basename (_tmp15_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp17_ = _tmp16_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp18_ = g_strdup_printf (_tmp9_, _tmp13_, _tmp17_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp19_ = _tmp18_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp17_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp13_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp19_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 584 "Resources.c"
+#line 600 "Resources.c"
 		} else {
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp20_ = C_ ("UndoRedo menu entry", "Add Tags");
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp21_;
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 596 "Resources.c"
+#line 612 "Resources.c"
 		}
 	}
 }
@@ -631,19 +647,19 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("_Delete Tag “%s”");
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 619 "Resources.c"
+#line 635 "Resources.c"
 }
 
 
@@ -652,19 +668,19 @@ gchar* resources_delete_tag_label (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 356 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Delete Tag “%s”");
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 640 "Resources.c"
+#line 656 "Resources.c"
 }
 
 
@@ -673,19 +689,19 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Re_name Tag “%s”…");
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 661 "Resources.c"
+#line 677 "Resources.c"
 }
 
 
@@ -695,23 +711,23 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
-#line 369 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (new_name != NULL, NULL);
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (new_name != NULL, NULL);
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Rename Tag “%s” to “%s”");
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = new_name;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 687 "Resources.c"
+#line 703 "Resources.c"
 }
 
 
@@ -721,21 +737,21 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 378 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_);
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 711 "Resources.c"
+#line 727 "Resources.c"
 }
 
 
@@ -745,21 +761,21 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_);
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 735 "Resources.c"
+#line 751 "Resources.c"
 }
 
 
@@ -769,21 +785,21 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_);
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 759 "Resources.c"
+#line 775 "Resources.c"
 }
 
 
@@ -793,21 +809,21 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_);
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 783 "Resources.c"
+#line 799 "Resources.c"
 }
 
 
@@ -816,19 +832,19 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename tag to “%s” because the tag already exists.");
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 804 "Resources.c"
+#line 820 "Resources.c"
 }
 
 
@@ -837,19 +853,19 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename search to “%s” because the search already exists.");
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 825 "Resources.c"
+#line 841 "Resources.c"
 }
 
 
@@ -859,23 +875,23 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (new_name != NULL, NULL);
 #line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (new_name != NULL, NULL);
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Rename Search “%s” to “%s”");
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = new_name;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 851 "Resources.c"
+#line 867 "Resources.c"
 }
 
 
@@ -884,121 +900,121 @@ gchar* resources_delete_search_label (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Delete Search “%s”");
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 872 "Resources.c"
+#line 888 "Resources.c"
 }
 
 
 const gchar* resources_rating_label (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 885 "Resources.c"
+#line 901 "Resources.c"
 		{
-#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
-#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 891 "Resources.c"
+#line 907 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 895 "Resources.c"
+#line 911 "Resources.c"
 		{
-#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 901 "Resources.c"
+#line 917 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 905 "Resources.c"
+#line 921 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_LABEL;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 914 "Resources.c"
+#line 930 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 918 "Resources.c"
+#line 934 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_LABEL;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 927 "Resources.c"
+#line 943 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 931 "Resources.c"
+#line 947 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_LABEL;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 940 "Resources.c"
+#line 956 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 944 "Resources.c"
+#line 960 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_LABEL;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 953 "Resources.c"
+#line 969 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 957 "Resources.c"
+#line 973 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_LABEL;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 966 "Resources.c"
+#line 982 "Resources.c"
 		}
 		default:
 		{
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 974 "Resources.c"
+#line 990 "Resources.c"
 		}
 	}
 }
@@ -1007,102 +1023,102 @@ const gchar* resources_rating_label (Rating rating) {
 const gchar* resources_rating_combo_box (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 989 "Resources.c"
+#line 1005 "Resources.c"
 		{
-#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
-#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 995 "Resources.c"
+#line 1011 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 999 "Resources.c"
+#line 1015 "Resources.c"
 		{
-#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
-#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1005 "Resources.c"
+#line 1021 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1009 "Resources.c"
+#line 1025 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_MENU;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1018 "Resources.c"
+#line 1034 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1022 "Resources.c"
+#line 1038 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_MENU;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1031 "Resources.c"
+#line 1047 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1035 "Resources.c"
+#line 1051 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_MENU;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1044 "Resources.c"
+#line 1060 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1048 "Resources.c"
+#line 1064 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_MENU;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1057 "Resources.c"
+#line 1073 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1061 "Resources.c"
+#line 1077 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_MENU;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1070 "Resources.c"
+#line 1086 "Resources.c"
 		}
 		default:
 		{
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_MENU;
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1078 "Resources.c"
+#line 1094 "Resources.c"
 		}
 	}
 }
@@ -1111,131 +1127,131 @@ const gchar* resources_rating_combo_box (Rating rating) {
 gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	gchar* result = NULL;
 	RatingFilter _tmp0_ = 0;
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = filter;
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1093 "Resources.c"
+#line 1109 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1102 "Resources.c"
+#line 1118 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1106 "Resources.c"
+#line 1122 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1118 "Resources.c"
+#line 1134 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1122 "Resources.c"
+#line 1138 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup (_tmp4_);
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1134 "Resources.c"
+#line 1150 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1138 "Resources.c"
+#line 1154 "Resources.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = g_strdup (_tmp6_);
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp7_;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1150 "Resources.c"
+#line 1166 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1154 "Resources.c"
+#line 1170 "Resources.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = g_strdup (_tmp8_);
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp9_;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1166 "Resources.c"
+#line 1182 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1172 "Resources.c"
+#line 1188 "Resources.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp11_;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1184 "Resources.c"
+#line 1200 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1188 "Resources.c"
+#line 1204 "Resources.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1197 "Resources.c"
+#line 1213 "Resources.c"
 		}
 		default:
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1202 "Resources.c"
+#line 1218 "Resources.c"
 		{
 			gchar* _tmp13_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1211 "Resources.c"
+#line 1227 "Resources.c"
 		}
 	}
 }
@@ -1244,126 +1260,126 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 gchar* resources_rating_progress (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1226 "Resources.c"
+#line 1242 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1235 "Resources.c"
+#line 1251 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1239 "Resources.c"
+#line 1255 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1248 "Resources.c"
+#line 1264 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1252 "Resources.c"
+#line 1268 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_ONE_PROGRESS;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup (_tmp3_);
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1264 "Resources.c"
+#line 1280 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1268 "Resources.c"
+#line 1284 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_TWO_PROGRESS;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup (_tmp5_);
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1280 "Resources.c"
+#line 1296 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1284 "Resources.c"
+#line 1300 "Resources.c"
 		{
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_RATE_THREE_PROGRESS;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = g_strdup (_tmp7_);
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1296 "Resources.c"
+#line 1312 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1300 "Resources.c"
+#line 1316 "Resources.c"
 		{
 			const gchar* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = resources_RATE_FOUR_PROGRESS;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = g_strdup (_tmp9_);
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1312 "Resources.c"
+#line 1328 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1316 "Resources.c"
+#line 1332 "Resources.c"
 		{
 			const gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = resources_RATE_FIVE_PROGRESS;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (_tmp11_);
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1328 "Resources.c"
+#line 1344 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp13_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1339 "Resources.c"
+#line 1355 "Resources.c"
 		}
 	}
 }
@@ -1372,85 +1388,85 @@ gchar* resources_rating_progress (Rating rating) {
 gchar* resources_get_stars (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1354 "Resources.c"
+#line 1370 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup ("\xE2\x98\x85");
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1363 "Resources.c"
+#line 1379 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1367 "Resources.c"
+#line 1383 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1376 "Resources.c"
+#line 1392 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1380 "Resources.c"
+#line 1396 "Resources.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1389 "Resources.c"
+#line 1405 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1393 "Resources.c"
+#line 1409 "Resources.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1402 "Resources.c"
+#line 1418 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1406 "Resources.c"
+#line 1422 "Resources.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1415 "Resources.c"
+#line 1431 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp6_ = NULL;
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup ("");
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1426 "Resources.c"
+#line 1442 "Resources.c"
 		}
 	}
 }
@@ -1459,113 +1475,113 @@ gchar* resources_get_stars (Rating rating) {
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	GdkPixbuf* result = NULL;
 	Rating _tmp0_ = 0;
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1441 "Resources.c"
+#line 1457 "Resources.c"
 		{
 			gint _tmp1_ = 0;
 			GdkPixbuf* _tmp2_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = scale;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, _tmp1_);
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1453 "Resources.c"
+#line 1469 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1457 "Resources.c"
+#line 1473 "Resources.c"
 		{
 			gint _tmp3_ = 0;
 			GdkPixbuf* _tmp4_ = NULL;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = scale;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, _tmp3_);
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1469 "Resources.c"
+#line 1485 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1473 "Resources.c"
+#line 1489 "Resources.c"
 		{
 			gint _tmp5_ = 0;
 			GdkPixbuf* _tmp6_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = scale;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, _tmp5_ * 2);
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1485 "Resources.c"
+#line 1501 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1489 "Resources.c"
+#line 1505 "Resources.c"
 		{
 			gint _tmp7_ = 0;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = scale;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, _tmp7_ * 3);
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1501 "Resources.c"
+#line 1517 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1505 "Resources.c"
+#line 1521 "Resources.c"
 		{
 			gint _tmp9_ = 0;
 			GdkPixbuf* _tmp10_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = scale;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, _tmp9_ * 4);
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1517 "Resources.c"
+#line 1533 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1521 "Resources.c"
+#line 1537 "Resources.c"
 		{
 			gint _tmp11_ = 0;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = scale;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, _tmp11_ * 5);
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1533 "Resources.c"
+#line 1549 "Resources.c"
 		}
 		default:
 		{
-#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1541 "Resources.c"
+#line 1557 "Resources.c"
 		}
 	}
 }
@@ -1705,503 +1721,503 @@ void resources_generate_rating_strings (void) {
 	gchar* _tmp120_ = NULL;
 	gchar* _tmp121_ = NULL;
 	gchar* _tmp122_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_strdup ("%s");
-#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
-	menu_base = _tmp0_;
 #line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+	menu_base = _tmp0_;
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _ ("Rate %s");
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
-	label_base = _tmp2_;
 #line 561 "/home/jens/Source/shotwell/src/Resources.vala"
+	label_base = _tmp2_;
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _ ("Set rating to %s");
-#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
-	tooltip_base = _tmp4_;
 #line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+	tooltip_base = _tmp4_;
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _ ("Setting rating to %s");
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
-	progress_base = _tmp6_;
 #line 563 "/home/jens/Source/shotwell/src/Resources.vala"
+	progress_base = _tmp6_;
+#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_strdup ("%s");
-#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_menu_base = _tmp7_;
 #line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_menu_base = _tmp7_;
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = _ ("Display %s");
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_label_base = _tmp9_;
 #line 565 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_label_base = _tmp9_;
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = _ ("Only show photos with a rating of %s");
-#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_tooltip_base = _tmp11_;
 #line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_tooltip_base = _tmp11_;
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _ ("%s or Better");
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_menu_base = _tmp13_;
 #line 567 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_or_higher_menu_base = _tmp13_;
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = _ ("Display %s or Better");
-#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_label_base = _tmp15_;
 #line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_or_higher_label_base = _tmp15_;
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = _ ("Only show photos with a rating of %s or better");
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_strdup (_tmp16_);
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_or_higher_tooltip_base = _tmp17_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = resources_get_stars (RATING_ONE);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = _tmp18_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = g_strdup_printf (menu_base, _tmp19_);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_MENU);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_MENU = _tmp20_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp19_);
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp19_);
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = resources_get_stars (RATING_TWO);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = _tmp21_;
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = g_strdup_printf (menu_base, _tmp22_);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_MENU);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_MENU = _tmp23_;
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp22_);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp22_);
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = resources_get_stars (RATING_THREE);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = _tmp24_;
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = g_strdup_printf (menu_base, _tmp25_);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_MENU);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_MENU = _tmp26_;
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp25_);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp25_);
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = resources_get_stars (RATING_FOUR);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = _tmp27_;
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = g_strdup_printf (menu_base, _tmp28_);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_MENU);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_MENU = _tmp29_;
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp28_);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp28_);
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = resources_get_stars (RATING_FIVE);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = _tmp30_;
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = g_strdup_printf (menu_base, _tmp31_);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_MENU);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_MENU = _tmp32_;
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp31_);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = resources_get_stars (RATING_ONE);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp34_ = _tmp33_;
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp35_ = g_strdup_printf (label_base, _tmp34_);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_LABEL);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_LABEL = _tmp35_;
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp34_);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp34_);
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp36_ = resources_get_stars (RATING_TWO);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp37_ = _tmp36_;
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp38_ = g_strdup_printf (label_base, _tmp37_);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_LABEL);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_LABEL = _tmp38_;
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp37_);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp37_);
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp39_ = resources_get_stars (RATING_THREE);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp40_ = _tmp39_;
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp41_ = g_strdup_printf (label_base, _tmp40_);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_LABEL);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_LABEL = _tmp41_;
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp40_);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp40_);
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp42_ = resources_get_stars (RATING_FOUR);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp43_ = _tmp42_;
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp44_ = g_strdup_printf (label_base, _tmp43_);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_LABEL);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_LABEL = _tmp44_;
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp43_);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp43_);
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp45_ = resources_get_stars (RATING_FIVE);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp46_ = _tmp45_;
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp47_ = g_strdup_printf (label_base, _tmp46_);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_LABEL);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_LABEL = _tmp47_;
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp46_);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp48_ = resources_get_stars (RATING_ONE);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp49_ = _tmp48_;
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp50_ = g_strdup_printf (tooltip_base, _tmp49_);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_TOOLTIP);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_TOOLTIP = _tmp50_;
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp49_);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp49_);
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp51_ = resources_get_stars (RATING_TWO);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp52_ = _tmp51_;
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp53_ = g_strdup_printf (tooltip_base, _tmp52_);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_TOOLTIP);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_TOOLTIP = _tmp53_;
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp52_);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp52_);
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp54_ = resources_get_stars (RATING_THREE);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp55_ = _tmp54_;
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp56_ = g_strdup_printf (tooltip_base, _tmp55_);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_TOOLTIP);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_TOOLTIP = _tmp56_;
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp55_);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp55_);
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp57_ = resources_get_stars (RATING_FOUR);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp58_ = _tmp57_;
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp59_ = g_strdup_printf (tooltip_base, _tmp58_);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_TOOLTIP);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_TOOLTIP = _tmp59_;
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp58_);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp58_);
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp60_ = resources_get_stars (RATING_FIVE);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp61_ = _tmp60_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp62_ = g_strdup_printf (tooltip_base, _tmp61_);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_TOOLTIP);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_TOOLTIP = _tmp62_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp61_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp63_ = resources_get_stars (RATING_ONE);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp64_ = _tmp63_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp65_ = g_strdup_printf (progress_base, _tmp64_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_PROGRESS);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_PROGRESS = _tmp65_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp64_);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp64_);
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp66_ = resources_get_stars (RATING_TWO);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp67_ = _tmp66_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp68_ = g_strdup_printf (progress_base, _tmp67_);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_PROGRESS);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_PROGRESS = _tmp68_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp67_);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp67_);
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp69_ = resources_get_stars (RATING_THREE);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp70_ = _tmp69_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp71_ = g_strdup_printf (progress_base, _tmp70_);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_PROGRESS);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_PROGRESS = _tmp71_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp70_);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp70_);
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp72_ = resources_get_stars (RATING_FOUR);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp73_ = _tmp72_;
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp74_ = g_strdup_printf (progress_base, _tmp73_);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_PROGRESS);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_PROGRESS = _tmp74_;
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp73_);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp73_);
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp75_ = resources_get_stars (RATING_FIVE);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp76_ = _tmp75_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp77_ = g_strdup_printf (progress_base, _tmp76_);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_PROGRESS);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_PROGRESS = _tmp77_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp76_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp78_ = resources_get_stars (RATING_ONE);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp79_ = _tmp78_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp80_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp79_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_MENU);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_MENU = _tmp80_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp79_);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp79_);
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp81_ = resources_get_stars (RATING_TWO);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp82_ = _tmp81_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp83_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp82_);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_MENU);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_MENU = _tmp83_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp82_);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp82_);
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp84_ = resources_get_stars (RATING_THREE);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp85_ = _tmp84_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp86_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp85_);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_MENU);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_MENU = _tmp86_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp85_);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp85_);
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp87_ = resources_get_stars (RATING_FOUR);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp88_ = _tmp87_;
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp89_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp88_);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_MENU);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_MENU = _tmp89_;
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp88_);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp88_);
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp90_ = resources_get_stars (RATING_FIVE);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp91_ = _tmp90_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp92_ = g_strdup_printf (display_rating_menu_base, _tmp91_);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_MENU);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_MENU = _tmp92_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp91_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp93_ = resources_get_stars (RATING_ONE);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp94_ = _tmp93_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp95_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp94_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_LABEL);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_LABEL = _tmp95_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp94_);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp94_);
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp96_ = resources_get_stars (RATING_TWO);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp97_ = _tmp96_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp98_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp97_);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_LABEL);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_LABEL = _tmp98_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp97_);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp97_);
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp99_ = resources_get_stars (RATING_THREE);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp100_ = _tmp99_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp101_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp100_);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_LABEL);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_LABEL = _tmp101_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp100_);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp100_);
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp102_ = resources_get_stars (RATING_FOUR);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp103_ = _tmp102_;
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp104_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp103_);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_LABEL);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_LABEL = _tmp104_;
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp103_);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp103_);
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp105_ = resources_get_stars (RATING_FIVE);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp106_ = _tmp105_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp107_ = g_strdup_printf (display_rating_label_base, _tmp106_);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_LABEL);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_LABEL = _tmp107_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp106_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp108_ = resources_get_stars (RATING_ONE);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp109_ = _tmp108_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp110_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp109_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP = _tmp110_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp109_);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp109_);
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp111_ = resources_get_stars (RATING_TWO);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp112_ = _tmp111_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp113_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp112_);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP = _tmp113_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp112_);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp112_);
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp114_ = resources_get_stars (RATING_THREE);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp115_ = _tmp114_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp116_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp115_);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP = _tmp116_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp115_);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp115_);
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp117_ = resources_get_stars (RATING_FOUR);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp118_ = _tmp117_;
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp119_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp118_);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = _tmp119_;
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp118_);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp118_);
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp120_ = resources_get_stars (RATING_FIVE);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp121_ = _tmp120_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp122_ = g_strdup_printf (display_rating_tooltip_base, _tmp121_);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = _tmp122_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp121_);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_menu_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_menu_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (progress_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2177 "Resources.c"
+#line 2193 "Resources.c"
 }
 
 
@@ -2211,70 +2227,34 @@ gchar* resources_jump_to_file_failed (GError* err) {
 	GError* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to open in file manager: %s");
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = err;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_->message;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2199 "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"
+#line 2215 "Resources.c"
 }
 
 
 void resources_init (void) {
-	GtkIconTheme* icon_theme = NULL;
 	GtkIconTheme* _tmp0_ = NULL;
 	GtkIconTheme* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = 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"
-	_tmp2_ = app_dirs_get_resources_dir ();
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 693 "/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 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = resources_get_icon_theme_engine ();
+#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = _tmp0_;
+#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (_tmp1_);
 #line 694 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 690 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icon_theme);
-#line 2250 "Resources.c"
+#line 2230 "Resources.c"
 }
 
 
@@ -2331,7 +2311,7 @@ void resources_fetch_lc_time_format (void) {
 	if (_tmp2_ != NULL) {
 #line 715 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2307 "Resources.c"
+#line 2287 "Resources.c"
 	}
 #line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
@@ -2349,13 +2329,13 @@ void resources_fetch_lc_time_format (void) {
 	_tmp7_ = lc_time;
 #line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2325 "Resources.c"
+#line 2305 "Resources.c"
 		const gchar* _tmp8_ = NULL;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = lc_time;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp8_);
-#line 2331 "Resources.c"
+#line 2311 "Resources.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
@@ -2415,25 +2395,25 @@ void resources_fetch_lc_time_format (void) {
 	_tmp22_ = old_messages;
 #line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ != NULL) {
-#line 2391 "Resources.c"
+#line 2371 "Resources.c"
 		const gchar* _tmp23_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = old_messages;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp23_);
-#line 2397 "Resources.c"
+#line 2377 "Resources.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = old_language;
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp24_ != NULL) {
-#line 2403 "Resources.c"
+#line 2383 "Resources.c"
 		const gchar* _tmp25_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = old_language;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_setenv ("LANGUAGE", _tmp25_, TRUE);
-#line 2409 "Resources.c"
+#line 2389 "Resources.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
@@ -2441,7 +2421,345 @@ void resources_fetch_lc_time_format (void) {
 	_g_free0 (old_messages);
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_language);
-#line 2417 "Resources.c"
+#line 2397 "Resources.c"
+}
+
+
+GType resources_unit_system_get_type (void) {
+	static volatile gsize resources_unit_system_type_id__volatile = 0;
+	if (g_once_init_enter (&resources_unit_system_type_id__volatile)) {
+		static const GEnumValue values[] = {{RESOURCES_UNIT_SYSTEM_IMPERIAL, "RESOURCES_UNIT_SYSTEM_IMPERIAL", "imperial"}, {RESOURCES_UNIT_SYSTEM_METRIC, "RESOURCES_UNIT_SYSTEM_METRIC", "metric"}, {RESOURCES_UNIT_SYSTEM_UNKNOWN, "RESOURCES_UNIT_SYSTEM_UNKNOWN", "unknown"}, {0, NULL, NULL}};
+		GType resources_unit_system_type_id;
+		resources_unit_system_type_id = g_enum_register_static ("ResourcesUnitSystem", values);
+		g_once_init_leave (&resources_unit_system_type_id__volatile, resources_unit_system_type_id);
+	}
+	return resources_unit_system_type_id__volatile;
+}
+
+
+static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gunichar _tmp1_ = 0U;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = c;
+#line 1018 "/usr/share/vala-0.34/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"
+	_result_ = _tmp2_;
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 2434 "Resources.c"
+		gchar* _tmp4_ = NULL;
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2442 "Resources.c"
+	} else {
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = -1;
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2448 "Resources.c"
+	}
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 2472 "Resources.c"
+		glong _tmp4_ = 0L;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2480 "Resources.c"
+	} else {
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2492 "Resources.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	gchar* _tmp22_ = NULL;
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 2516 "Resources.c"
+		glong _tmp2_ = 0L;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 2522 "Resources.c"
+	} else {
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 2526 "Resources.c"
+	}
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2530 "Resources.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 2542 "Resources.c"
+	} else {
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 2552 "Resources.c"
+	}
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 2558 "Resources.c"
+		glong _tmp9_ = 0L;
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 2572 "Resources.c"
+	} else {
+		glong _tmp12_ = 0L;
+		glong _tmp13_ = 0L;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 2582 "Resources.c"
+	}
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 2588 "Resources.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 2597 "Resources.c"
+	}
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1324 "/usr/share/vala-0.34/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"
+	_tmp20_ = offset;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1325 "/usr/share/vala-0.34/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"
+	result = _tmp22_;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 2617 "Resources.c"
+}
+
+
+static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle) {
+	int i;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	for (i = 0; i < stack_length; i++) {
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+		if (g_strcmp0 (stack[i], needle) == 0) {
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+			return TRUE;
+#line 2629 "Resources.c"
+		}
+	}
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	return FALSE;
+#line 2634 "Resources.c"
+}
+
+
+ResourcesUnitSystem resources_get_default_measurement_unit (void) {
+	ResourcesUnitSystem result = 0;
+	ResourcesUnitSystem _tmp0_ = 0;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gint index = 0;
+	const gchar* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	const gchar* _tmp15_ = NULL;
+	ResourcesUnitSystem _tmp16_ = 0;
+#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = resources_unit_system;
+#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) {
+#line 2654 "Resources.c"
+		ResourcesUnitSystem _tmp1_ = 0;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp1_ = resources_unit_system;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		result = _tmp1_;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		return result;
+#line 2662 "Resources.c"
+	}
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = g_getenv ("LC_MEASUREMENT");
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (resources_lc_measurement);
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	resources_lc_measurement = _tmp3_;
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp4_ = resources_lc_measurement;
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp4_ == NULL) {
+#line 2676 "Resources.c"
+		gchar** _tmp5_ = NULL;
+		gchar** _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp6_ = _tmp5_ = g_get_language_names ();
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp7_ = _tmp6_[0];
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp8_ = g_strdup (_tmp7_);
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (resources_lc_measurement);
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		resources_lc_measurement = _tmp8_;
+#line 2691 "Resources.c"
+	}
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp9_ = resources_lc_measurement;
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	index = _tmp10_;
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp11_ = index;
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp11_ > 0) {
+#line 2703 "Resources.c"
+		const gchar* _tmp12_ = NULL;
+		gint _tmp13_ = 0;
+		gchar* _tmp14_ = NULL;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp12_ = resources_lc_measurement;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp13_ = index;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp14_ = string_substring (_tmp12_, (glong) 0, (glong) _tmp13_);
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (resources_lc_measurement);
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		resources_lc_measurement = _tmp14_;
+#line 2717 "Resources.c"
+	}
+#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+	resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp15_ = resources_lc_measurement;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) {
+#line 799 "/home/jens/Source/shotwell/src/Resources.vala"
+		resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL;
+#line 2727 "Resources.c"
+	}
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp16_ = resources_unit_system;
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp16_;
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	return result;
+#line 2735 "Resources.c"
 }
 
 
@@ -2454,23 +2772,23 @@ gchar* resources_get_hh_mm_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_FORMAT_STRING;
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 777 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2436 "Resources.c"
+#line 2754 "Resources.c"
 	}
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2446 "Resources.c"
+#line 2764 "Resources.c"
 }
 
 
@@ -2479,23 +2797,23 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 785 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2461 "Resources.c"
+#line 2779 "Resources.c"
 	}
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2471 "Resources.c"
+#line 2789 "Resources.c"
 }
 
 
@@ -2504,23 +2822,23 @@ gchar* resources_get_long_date_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_LONG_DATE_FORMAT_STRING;
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2486 "Resources.c"
+#line 2804 "Resources.c"
 	}
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2496 "Resources.c"
+#line 2814 "Resources.c"
 }
 
 
@@ -2529,23 +2847,23 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 801 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2511 "Resources.c"
+#line 2829 "Resources.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2521 "Resources.c"
+#line 2839 "Resources.c"
 }
 
 
@@ -2554,23 +2872,23 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 809 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2536 "Resources.c"
+#line 2854 "Resources.c"
 	}
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2546 "Resources.c"
+#line 2864 "Resources.c"
 }
 
 
@@ -2579,23 +2897,23 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 817 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2561 "Resources.c"
+#line 2879 "Resources.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2571 "Resources.c"
+#line 2889 "Resources.c"
 }
 
 
@@ -2604,173 +2922,139 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 825 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2586 "Resources.c"
+#line 2904 "Resources.c"
 	}
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2596 "Resources.c"
+#line 2914 "Resources.c"
 }
 
 
-GFile* resources_get_ui (const gchar* filename) {
-	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+gchar* resources_get_ui (const gchar* filename) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 865 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = app_dirs_get_resources_dir ();
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _tmp0_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_file_get_child (_tmp1_, "ui");
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = filename;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_file_get_child (_tmp3_, _tmp4_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = _tmp5_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp1_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp6_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = filename;
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", _tmp0_);
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp1_;
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2633 "Resources.c"
+#line 2932 "Resources.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 2939 "Resources.c"
 }
 
 
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
+	GdkPixbuf* _tmp7_ = NULL;
+	GdkPixbuf* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2647 "Resources.c"
+#line 2953 "Resources.c"
 		{
-			GdkPixbuf* _tmp1_ = NULL;
-			GFile* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
-			GFile* _tmp4_ = NULL;
-			GFile* _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
-			GFile* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			GdkPixbuf* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
-			GdkPixbuf* _tmp12_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp2_ = app_dirs_get_resources_dir ();
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp3_ = _tmp2_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp5_ = _tmp4_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp6_ = g_file_get_child (_tmp5_, RESOURCES_NONINTERPRETABLE_BADGE_FILE);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp7_ = _tmp6_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp8_ = g_file_get_path (_tmp7_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp9_ = _tmp8_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp11_ = _tmp10_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_free0 (_tmp9_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp7_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp5_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp3_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp1_ = _tmp11_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
+			gchar* path = NULL;
+			gchar* _tmp1_ = NULL;
+			GdkPixbuf* _tmp2_ = NULL;
+			const gchar* _tmp3_ = NULL;
+			GdkPixbuf* _tmp4_ = NULL;
+			GdkPixbuf* _tmp5_ = NULL;
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp1_ = g_strdup ("/org/gnome/Shotwell/icons/" RESOURCES_NONINTERPRETABLE_BADGE_FILE);
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+			path = _tmp1_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp3_ = path;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp4_ = gdk_pixbuf_new_from_resource (_tmp3_, &_inner_error_);
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp2_ = _tmp4_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2693 "Resources.c"
-				goto __catch428_g_error;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+				_g_free0 (path);
+#line 2975 "Resources.c"
+				goto __catch429_g_error;
 			}
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp12_ = _tmp1_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp1_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp5_ = _tmp2_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp2_ = NULL;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (resources_noninterpretable_badge_pixbuf);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			resources_noninterpretable_badge_pixbuf = _tmp12_;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp1_);
-#line 2706 "Resources.c"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			resources_noninterpretable_badge_pixbuf = _tmp5_;
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_object_unref0 (_tmp2_);
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_free0 (path);
+#line 2990 "Resources.c"
 		}
-		goto __finally428;
-		__catch428_g_error:
+		goto __finally429;
+		__catch429_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp13_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+			const gchar* _tmp6_ = NULL;
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			err = _inner_error_;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_inner_error_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp13_ = err->message;
-#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 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 878 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp6_ = err->message;
+#line 878 "/home/jens/Source/shotwell/src/Resources.vala"
+			g_error ("Resources.vala:878: VideoReader can't load noninterpretable badge imag" \
+"e: %s", _tmp6_);
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 2723 "Resources.c"
+#line 3007 "Resources.c"
 		}
-		__finally428:
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+		__finally429:
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/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 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_clear_error (&_inner_error_);
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 2734 "Resources.c"
+#line 3018 "Resources.c"
 		}
 	}
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp14_ = resources_noninterpretable_badge_pixbuf;
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp15_;
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp7_ = resources_noninterpretable_badge_pixbuf;
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp8_;
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2745 "Resources.c"
+#line 3029 "Resources.c"
 }
 
 
@@ -2779,43 +3063,19 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	GtkIconTheme* icon_theme = NULL;
 	GtkIconTheme* _tmp0_ = NULL;
 	GtkIconTheme* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_theme = _tmp1_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = app_dirs_get_resources_dir ();
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = _tmp4_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = g_file_get_path (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = _tmp6_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+	gtk_icon_theme_add_resource_path (icon_theme, "/org/gnome/Shotwell/icons");
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = icon_theme;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2790 "Resources.c"
+#line 3050 "Resources.c"
 }
 
 
@@ -2840,13 +3100,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	gchar* _tmp31_ = NULL;
 	gchar* _tmp32_ = NULL;
 	GdkPixbuf* _tmp33_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 894 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_scaled_icon_cache;
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 2821 "Resources.c"
+#line 3081 "Resources.c"
 		gchar* scaled_name = NULL;
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
@@ -2854,334 +3114,302 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		GeeHashMap* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = name;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = scale;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_);
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		scaled_name = _tmp3_;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = resources_scaled_icon_cache;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = scaled_name;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/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 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 2845 "Resources.c"
+#line 3105 "Resources.c"
 			GeeHashMap* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_scaled_icon_cache;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = scaled_name;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/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 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = (GdkPixbuf*) _tmp9_;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (scaled_name);
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 2861 "Resources.c"
+#line 3121 "Resources.c"
 		}
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 2865 "Resources.c"
+#line 3125 "Resources.c"
 	}
-#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
-#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 2871 "Resources.c"
+#line 3131 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 2879 "Resources.c"
+#line 3139 "Resources.c"
 	}
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = name;
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/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 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = (GdkPixbuf*) _tmp14_;
-#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = pixbuf;
-#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 2893 "Resources.c"
+#line 3153 "Resources.c"
 		const gchar* _tmp16_ = NULL;
 		GdkPixbuf* _tmp17_ = NULL;
 		GdkPixbuf* _tmp18_ = NULL;
 		GeeHashMap* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = name;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = resources_load_icon (_tmp16_, 0);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp17_;
-#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = pixbuf;
-#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp18_ == NULL) {
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (pixbuf);
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 2918 "Resources.c"
+#line 3178 "Resources.c"
 		}
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = name;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = pixbuf;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 2928 "Resources.c"
+#line 3188 "Resources.c"
 	}
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ <= 0) {
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = pixbuf;
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 2938 "Resources.c"
+#line 3198 "Resources.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = scale;
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE);
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	scaled_pixbuf = _tmp25_;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = resources_scaled_icon_cache;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 2952 "Resources.c"
+#line 3212 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 2960 "Resources.c"
+#line 3220 "Resources.c"
 	}
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = name;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = scale;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_);
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = _tmp31_;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = scaled_pixbuf;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/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 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp32_);
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = scaled_pixbuf;
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2984 "Resources.c"
+#line 3244 "Resources.c"
 }
 
 
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	GdkPixbuf* result = NULL;
-	GFile* icons_dir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp16_ = NULL;
-	GdkPixbuf* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
+	GdkPixbuf* _tmp8_ = NULL;
+	GdkPixbuf* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = app_dirs_get_resources_dir ();
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _tmp0_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_file_get_child (_tmp1_, "icons");
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp1_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	icons_dir = _tmp3_;
-#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 930 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3016 "Resources.c"
+#line 3259 "Resources.c"
 	{
+		gchar* path = NULL;
+		const gchar* _tmp0_ = NULL;
+		gchar* _tmp1_ = NULL;
+		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp3_ = NULL;
 		GdkPixbuf* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp5_ = name;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp6_ = g_file_get_child (icons_dir, _tmp5_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp7_ = _tmp6_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp8_ = g_file_get_path (_tmp7_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp9_ = _tmp8_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = _tmp10_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_free0 (_tmp9_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp7_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = _tmp11_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp0_ = name;
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", _tmp0_);
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		path = _tmp1_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp3_ = gdk_pixbuf_new_from_resource (path, &_inner_error_);
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = _tmp3_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3049 "Resources.c"
-			goto __catch429_g_error;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_free0 (path);
+#line 3281 "Resources.c"
+			goto __catch430_g_error;
 		}
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp12_ = _tmp4_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp4_ = _tmp2_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = NULL;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		pixbuf = _tmp12_;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp4_);
-#line 3062 "Resources.c"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		pixbuf = _tmp4_;
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp2_);
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (path);
+#line 3296 "Resources.c"
 	}
-	goto __finally429;
-	__catch429_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+		const gchar* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp13_ = name;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp14_ = err;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp15_ = _tmp14_->message;
-#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"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp5_ = name;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp6_ = err;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp7_ = _tmp6_->message;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_);
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3085 "Resources.c"
+#line 3319 "Resources.c"
 	}
-	__finally429:
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally430:
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icons_dir);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/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 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3100 "Resources.c"
+#line 3332 "Resources.c"
 	}
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp16_ = pixbuf;
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp16_ == NULL) {
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp8_ = pixbuf;
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp8_ == NULL) {
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icons_dir);
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3114 "Resources.c"
+#line 3344 "Resources.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp18_ = scale;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp18_ > 0) {
-#line 3120 "Resources.c"
-		GdkPixbuf* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		GdkPixbuf* _tmp21_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp19_ = pixbuf;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp20_ = scale;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp21_ = scale_pixbuf (_tmp19_, _tmp20_, GDK_INTERP_BILINEAR, FALSE);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp17_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp17_ = _tmp21_;
-#line 3134 "Resources.c"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp10_ = scale;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp10_ > 0) {
+#line 3350 "Resources.c"
+		GdkPixbuf* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
+		GdkPixbuf* _tmp13_ = NULL;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp11_ = pixbuf;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp12_ = scale;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp13_ = scale_pixbuf (_tmp11_, _tmp12_, GDK_INTERP_BILINEAR, FALSE);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp9_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp9_ = _tmp13_;
+#line 3364 "Resources.c"
 	} else {
-		GdkPixbuf* _tmp22_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp22_ = pixbuf;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp17_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp17_ = _tmp23_;
-#line 3146 "Resources.c"
+		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp15_ = NULL;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp14_ = pixbuf;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp15_ = _g_object_ref0 (_tmp14_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp9_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp9_ = _tmp15_;
+#line 3376 "Resources.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp17_;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp9_;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icons_dir);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3156 "Resources.c"
+#line 3384 "Resources.c"
 }
 
 
@@ -3199,88 +3427,88 @@ gchar* resources_get_help_path (void) {
 	GFile* _tmp7_ = NULL;
 	GFile* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "help");
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "C");
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_dir = _tmp5_;
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = help_dir;
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_child (_tmp6_, "index.page");
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_index = _tmp7_;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = help_index;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp9_) {
-#line 3204 "Resources.c"
+#line 3432 "Resources.c"
 		gchar* help_path = NULL;
 		GFile* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = help_dir;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = g_file_get_path (_tmp10_);
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (help_path);
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		help_path = _tmp11_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = help_path;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (!_tmp13_) {
-#line 3224 "Resources.c"
+#line 3452 "Resources.c"
 			const gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = help_path;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = g_strconcat (_tmp14_, "/", NULL);
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp15_;
-#line 3235 "Resources.c"
+#line 3463 "Resources.c"
 		}
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_index);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_dir);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3245 "Resources.c"
+#line 3473 "Resources.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_index);
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_dir);
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3255 "Resources.c"
+#line 3483 "Resources.c"
 }
 
 
@@ -3290,17 +3518,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 940 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_help_path ();
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_path = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = help_path;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3275 "Resources.c"
+#line 3503 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 		gchar** argv = NULL;
 		gchar** _tmp6_ = NULL;
@@ -3332,179 +3560,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		gchar** _tmp25_ = NULL;
 		gint _tmp25__length1 = 0;
 		const gchar* _tmp26_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3311 "Resources.c"
+#line 3539 "Resources.c"
 			const gchar* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = anchor;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3325 "Resources.c"
+#line 3553 "Resources.c"
 		}
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = _tmp6_;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv_length1 = 3;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		_argv_size_ = argv_length1;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = argv;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7__length1 = argv_length1;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_strdup ("yelp");
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp7_[0]);
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_[0] = _tmp8_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp7_[0];
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = argv;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10__length1 = argv_length1;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = help_path;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp10_[1]);
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_[1] = _tmp12_;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = _tmp10_[1];
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = argv;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14__length1 = argv_length1;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp14_[2]);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_[2] = NULL;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_[2];
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = app_dirs_get_exec_dir ();
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = _tmp17_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = _tmp19_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = argv;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21__length1 = argv_length1;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/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 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		pid = _tmp22_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = _tmp23_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp20_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp18_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp24_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3405 "Resources.c"
+#line 3633 "Resources.c"
 		}
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3415 "Resources.c"
+#line 3643 "Resources.c"
 		}
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25__length1 = argv_length1;
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp26_ = _tmp25_[0];
-#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"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:995: Unable to launch %s", _tmp26_);
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3427 "Resources.c"
+#line 3655 "Resources.c"
 	}
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 3433 "Resources.c"
+#line 3661 "Resources.c"
 		GdkScreen* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp29_ = anchor;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp31_ = _tmp30_;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp31_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3458 "Resources.c"
+#line 3686 "Resources.c"
 		}
 	} else {
 		GdkScreen* _tmp32_ = NULL;
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3474 "Resources.c"
+#line 3702 "Resources.c"
 		}
 	}
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 3479 "Resources.c"
+#line 3707 "Resources.c"
 }
 
 
@@ -3520,33 +3748,33 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	GdkRGBA _tmp4_ = {0};
 	gdouble _tmp5_ = 0.0;
 	gchar* _tmp6_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = *color;
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_.red;
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	r = (gint) (_tmp1_ * 255);
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = *color;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_.green;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	g = (gint) (_tmp3_ * 255);
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = *color;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_.blue;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	b = (gint) (_tmp5_ * 255);
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b);
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3521 "Resources.c"
+#line 3749 "Resources.c"
 }
 
 
@@ -3564,136 +3792,136 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	GtkWidget* _tmp21_ = NULL;
 	GtkCssProvider* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stylesheet != NULL);
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_providers;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 3547 "Resources.c"
+#line 3775 "Resources.c"
 		GeeHashMap* _tmp1_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 3555 "Resources.c"
+#line 3783 "Resources.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = widget;
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 3565 "Resources.c"
+#line 3793 "Resources.c"
 		GtkWidget* _tmp5_ = NULL;
 		GtkStyleContext* _tmp6_ = NULL;
 		GeeMap* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		GtkCssProvider* _tmp10_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = resources_providers;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = widget;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = gee_map_get (_tmp7_, _tmp8_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = (GtkCssProvider*) _tmp9_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/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 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 3588 "Resources.c"
+#line 3816 "Resources.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 3594 "Resources.c"
+#line 3822 "Resources.c"
 	{
 		GtkCssProvider* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stylesheet;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3606 "Resources.c"
-			goto __catch430_g_error;
+#line 3834 "Resources.c"
+			goto __catch431_g_error;
 		}
 	}
-	goto __finally430;
-	__catch430_g_error:
+	goto __finally431;
+	__catch431_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = stylesheet;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = e;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp15_->message;
-#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"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:1030: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (e);
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3635 "Resources.c"
+#line 3863 "Resources.c"
 	}
-	__finally430:
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally431:
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/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 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3648 "Resources.c"
+#line 3876 "Resources.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = gtk_widget_get_style_context (_tmp17_);
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = styler;
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/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 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = resources_providers;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = widget;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = styler;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 3668 "Resources.c"
+#line 3896 "Resources.c"
 }
 
 
@@ -3715,4 +3943,16 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
 
diff --git a/src/Resources.vala b/src/Resources.vala
index feb568b..e26448a 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -87,7 +87,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string GO_PREVIOUS = "go-previous";
 
     
-    public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    //public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    public const string ICON_ABOUT_LOGO = "about-aachen.jpg";
     public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
     public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point";
     public const string ICON_RATING_REJECTED = "rejected.svg";
@@ -686,11 +687,10 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     private string END_MULTIDAY_DATE_FORMAT_STRING = null;
     private string START_MULTIMONTH_DATE_FORMAT_STRING = null;
     private string END_MULTIMONTH_DATE_FORMAT_STRING = null;
-        
+
     public void init () {
-        var icon_theme = Gtk.IconTheme.get_default();
+        get_icon_theme_engine();
         // load application-wide stock icons as IconSets
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
         generate_rating_strings();
     }
     
@@ -766,6 +766,40 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         if (old_language != null) {
             Environment.set_variable("LANGUAGE", old_language, true);
         }
+
+    }
+
+    public enum UnitSystem {
+        IMPERIAL,
+        METRIC,
+        UNKNOWN
+    }
+
+    private string lc_measurement = null;
+    private UnitSystem unit_system = UnitSystem.UNKNOWN;
+    private const string IMPERIAL_COUNTRIES[] = {"unm_US", "es_US", "en_US", "yi_US" };
+
+    public UnitSystem get_default_measurement_unit() {
+        if (unit_system != UnitSystem.UNKNOWN) {
+            return unit_system;
+        }
+
+        lc_measurement = Environment.get_variable("LC_MEASUREMENT");
+        if (lc_measurement == null) {
+            lc_measurement = Intl.get_language_names()[0];
+        }
+
+        var index = lc_measurement.last_index_of_char('.');
+        if (index > 0) {
+            lc_measurement = lc_measurement.substring(0, index);
+        }
+
+        unit_system = UnitSystem.METRIC;
+        if (lc_measurement in IMPERIAL_COUNTRIES) {
+            unit_system = UnitSystem.IMPERIAL;
+        }
+
+        return unit_system;
     }
     
     /**
@@ -828,8 +862,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return END_MULTIMONTH_DATE_FORMAT_STRING;
     }
 
-    public File get_ui(string filename) {
-        return AppDirs.get_resources_dir().get_child("ui").get_child(filename);
+    public string get_ui(string filename) {
+        return "/org/gnome/Shotwell/ui/%s".printf(filename);
     }
 
     private const string NONINTERPRETABLE_BADGE_FILE = "noninterpretable-video.png";
@@ -838,8 +872,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public Gdk.Pixbuf? get_noninterpretable_badge_pixbuf() {
         if (noninterpretable_badge_pixbuf == null) {
             try {
-                noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_file(AppDirs.get_resources_dir().get_child(
-                    "icons").get_child(NONINTERPRETABLE_BADGE_FILE).get_path());
+                var path = "/org/gnome/Shotwell/icons/" + NONINTERPRETABLE_BADGE_FILE;
+                noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_resource(path);
             } catch (Error err) {
                 error("VideoReader can't load noninterpretable badge image: %s", err.message);
             }
@@ -850,7 +884,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public Gtk.IconTheme get_icon_theme_engine() {
         Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
+        icon_theme.add_resource_path("/org/gnome/Shotwell/icons");
         
         return icon_theme;
     }
@@ -893,18 +927,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     }
     
     public Gdk.Pixbuf? load_icon(string name, int scale = DEFAULT_ICON_SCALE) {
-        File icons_dir = AppDirs.get_resources_dir().get_child("icons");
-        
         Gdk.Pixbuf pixbuf = null;
         try {
-            pixbuf = new Gdk.Pixbuf.from_file(icons_dir.get_child(name).get_path());
+            var path = "/org/gnome/Shotwell/icons/%s".printf(name);
+            pixbuf = new Gdk.Pixbuf.from_resource(path);
         } catch (Error err) {
             critical("Unable to load icon %s: %s", name, err.message);
         }
 
         if (pixbuf == null)
             return null;
-        
+
         return (scale > 0) ? scale_pixbuf(pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
     }
     
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 6d1e92f..11e314e 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1266,6 +1266,7 @@ SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
 SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_panic (const gchar* msg);
 static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self);
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
@@ -1480,7 +1481,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 1484 "SearchFilter.c"
+#line 1485 "SearchFilter.c"
 }
 
 
@@ -1489,7 +1490,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 1493 "SearchFilter.c"
+#line 1494 "SearchFilter.c"
 }
 
 
@@ -1508,7 +1509,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 1512 "SearchFilter.c"
+#line 1513 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1516,11 +1517,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 1520 "SearchFilter.c"
+#line 1521 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1524 "SearchFilter.c"
+#line 1525 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1528,11 +1529,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 1532 "SearchFilter.c"
+#line 1533 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1536 "SearchFilter.c"
+#line 1537 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1540,11 +1541,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 1544 "SearchFilter.c"
+#line 1545 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1548 "SearchFilter.c"
+#line 1549 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1552,11 +1553,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 1556 "SearchFilter.c"
+#line 1557 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1560 "SearchFilter.c"
+#line 1561 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1564,11 +1565,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 1568 "SearchFilter.c"
+#line 1569 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1572 "SearchFilter.c"
+#line 1573 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1576,11 +1577,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 1580 "SearchFilter.c"
+#line 1581 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1584 "SearchFilter.c"
+#line 1585 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1588,11 +1589,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 1592 "SearchFilter.c"
+#line 1593 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1596 "SearchFilter.c"
+#line 1597 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1600,11 +1601,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 1604 "SearchFilter.c"
+#line 1605 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1608 "SearchFilter.c"
+#line 1609 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1612,11 +1613,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 1616 "SearchFilter.c"
+#line 1617 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1620 "SearchFilter.c"
+#line 1621 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1624,11 +1625,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 1628 "SearchFilter.c"
+#line 1629 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1632 "SearchFilter.c"
+#line 1633 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1636,11 +1637,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 1640 "SearchFilter.c"
+#line 1641 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1644 "SearchFilter.c"
+#line 1645 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1648,12 +1649,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 1652 "SearchFilter.c"
+#line 1653 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1657 "SearchFilter.c"
+#line 1658 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1661,7 +1662,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 1665 "SearchFilter.c"
+#line 1666 "SearchFilter.c"
 		}
 	}
 }
@@ -1681,7 +1682,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1685 "SearchFilter.c"
+#line 1686 "SearchFilter.c"
 }
 
 
@@ -1696,7 +1697,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 1700 "SearchFilter.c"
+#line 1701 "SearchFilter.c"
 }
 
 
@@ -1720,13 +1721,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 1724 "SearchFilter.c"
+#line 1725 "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 1730 "SearchFilter.c"
+#line 1731 "SearchFilter.c"
 }
 
 
@@ -1737,17 +1738,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 1741 "SearchFilter.c"
+#line 1742 "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 1747 "SearchFilter.c"
+#line 1748 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1751 "SearchFilter.c"
+#line 1752 "SearchFilter.c"
 }
 
 
@@ -1770,7 +1771,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 1774 "SearchFilter.c"
+#line 1775 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1781,13 +1782,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 1785 "SearchFilter.c"
+#line 1786 "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 1791 "SearchFilter.c"
+#line 1792 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1799,7 +1800,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 1803 "SearchFilter.c"
+#line 1804 "SearchFilter.c"
 		const gchar* _tmp8_ = NULL;
 		gchar** _tmp9_ = NULL;
 		gchar** _tmp10_ = NULL;
@@ -1815,7 +1816,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 1819 "SearchFilter.c"
+#line 1820 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1825,7 +1826,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 1829 "SearchFilter.c"
+#line 1830 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
@@ -1843,7 +1844,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 1847 "SearchFilter.c"
+#line 1848 "SearchFilter.c"
 }
 
 
@@ -1862,7 +1863,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 1866 "SearchFilter.c"
+#line 1867 "SearchFilter.c"
 }
 
 
@@ -1877,7 +1878,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 1881 "SearchFilter.c"
+#line 1882 "SearchFilter.c"
 }
 
 
@@ -1892,7 +1893,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 1896 "SearchFilter.c"
+#line 1897 "SearchFilter.c"
 }
 
 
@@ -1907,7 +1908,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1911 "SearchFilter.c"
+#line 1912 "SearchFilter.c"
 }
 
 
@@ -1925,31 +1926,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 1929 "SearchFilter.c"
+#line 1930 "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 1936 "SearchFilter.c"
+#line 1937 "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 1942 "SearchFilter.c"
+#line 1943 "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 1949 "SearchFilter.c"
+#line 1950 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1953 "SearchFilter.c"
+#line 1954 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -1957,45 +1958,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 1961 "SearchFilter.c"
+#line 1962 "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 1967 "SearchFilter.c"
+#line 1968 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 1971 "SearchFilter.c"
+#line 1972 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 1975 "SearchFilter.c"
+#line 1976 "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 1981 "SearchFilter.c"
+#line 1982 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 1985 "SearchFilter.c"
+#line 1986 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 1989 "SearchFilter.c"
+#line 1990 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 1993 "SearchFilter.c"
+#line 1994 "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 1999 "SearchFilter.c"
+#line 2000 "SearchFilter.c"
 }
 
 
@@ -2005,7 +2006,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 2009 "SearchFilter.c"
+#line 2010 "SearchFilter.c"
 }
 
 
@@ -2020,7 +2021,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2024 "SearchFilter.c"
+#line 2025 "SearchFilter.c"
 }
 
 
@@ -2032,7 +2033,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 2036 "SearchFilter.c"
+#line 2037 "SearchFilter.c"
 }
 
 
@@ -2047,7 +2048,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 2051 "SearchFilter.c"
+#line 2052 "SearchFilter.c"
 }
 
 
@@ -2059,7 +2060,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 2063 "SearchFilter.c"
+#line 2064 "SearchFilter.c"
 }
 
 
@@ -2074,7 +2075,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 2078 "SearchFilter.c"
+#line 2079 "SearchFilter.c"
 }
 
 
@@ -2086,7 +2087,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 2090 "SearchFilter.c"
+#line 2091 "SearchFilter.c"
 }
 
 
@@ -2101,7 +2102,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 2105 "SearchFilter.c"
+#line 2106 "SearchFilter.c"
 }
 
 
@@ -2113,7 +2114,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 2117 "SearchFilter.c"
+#line 2118 "SearchFilter.c"
 }
 
 
@@ -2128,14 +2129,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2132 "SearchFilter.c"
+#line 2133 "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 2139 "SearchFilter.c"
+#line 2140 "SearchFilter.c"
 }
 
 
@@ -2152,7 +2153,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 2156 "SearchFilter.c"
+#line 2157 "SearchFilter.c"
 }
 
 
@@ -2165,7 +2166,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 2169 "SearchFilter.c"
+#line 2170 "SearchFilter.c"
 }
 
 
@@ -2196,7 +2197,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 2200 "SearchFilter.c"
+#line 2201 "SearchFilter.c"
 }
 
 
@@ -2212,7 +2213,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 2216 "SearchFilter.c"
+#line 2217 "SearchFilter.c"
 }
 
 
@@ -2244,7 +2245,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2248 "SearchFilter.c"
+#line 2249 "SearchFilter.c"
 }
 
 
@@ -2282,14 +2283,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 2286 "SearchFilter.c"
+#line 2287 "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 2293 "SearchFilter.c"
+#line 2294 "SearchFilter.c"
 			MediaSource* _tmp6_ = NULL;
 			Rating _tmp7_ = 0;
 			Rating _tmp8_ = 0;
@@ -2301,11 +2302,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 2305 "SearchFilter.c"
+#line 2306 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2309 "SearchFilter.c"
+#line 2310 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2315,7 +2316,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 2319 "SearchFilter.c"
+#line 2320 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
@@ -2323,7 +2324,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 2327 "SearchFilter.c"
+#line 2328 "SearchFilter.c"
 				MediaSource* _tmp11_ = NULL;
 				Rating _tmp12_ = 0;
 				Rating _tmp13_ = 0;
@@ -2335,11 +2336,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 2339 "SearchFilter.c"
+#line 2340 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2343 "SearchFilter.c"
+#line 2344 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2349,7 +2350,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 2353 "SearchFilter.c"
+#line 2354 "SearchFilter.c"
 			}
 		}
 	}
@@ -2357,7 +2358,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 2361 "SearchFilter.c"
+#line 2362 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
@@ -2368,21 +2369,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 2372 "SearchFilter.c"
+#line 2373 "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 2378 "SearchFilter.c"
+#line 2379 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2382 "SearchFilter.c"
+#line 2383 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2386 "SearchFilter.c"
+#line 2387 "SearchFilter.c"
 			MediaSource* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2391,11 +2392,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 2395 "SearchFilter.c"
+#line 2396 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2399 "SearchFilter.c"
+#line 2400 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2405,34 +2406,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 2409 "SearchFilter.c"
+#line 2410 "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 2416 "SearchFilter.c"
+#line 2417 "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 2422 "SearchFilter.c"
+#line 2423 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2426 "SearchFilter.c"
+#line 2427 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2430 "SearchFilter.c"
+#line 2431 "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 2436 "SearchFilter.c"
+#line 2437 "SearchFilter.c"
 			gboolean _tmp26_ = FALSE;
 			gboolean _tmp27_ = FALSE;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2447,7 +2448,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 2451 "SearchFilter.c"
+#line 2452 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_ = NULL;
@@ -2455,7 +2456,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 2459 "SearchFilter.c"
+#line 2460 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_ = NULL;
 				Photo* _tmp30_ = NULL;
@@ -2473,7 +2474,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 2477 "SearchFilter.c"
+#line 2478 "SearchFilter.c"
 					Photo* _tmp33_ = NULL;
 					gboolean _tmp34_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2482,7 +2483,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 2486 "SearchFilter.c"
+#line 2487 "SearchFilter.c"
 						gboolean _tmp35_ = FALSE;
 						gboolean _tmp36_ = FALSE;
 						gboolean _tmp37_ = FALSE;
@@ -2492,7 +2493,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 2496 "SearchFilter.c"
+#line 2497 "SearchFilter.c"
 							gboolean _tmp38_ = FALSE;
 							gboolean _tmp39_ = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2501,11 +2502,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 2505 "SearchFilter.c"
+#line 2506 "SearchFilter.c"
 						} else {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = FALSE;
-#line 2509 "SearchFilter.c"
+#line 2510 "SearchFilter.c"
 						}
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (_tmp35_) {
@@ -2517,7 +2518,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 2521 "SearchFilter.c"
+#line 2522 "SearchFilter.c"
 						}
 					} else {
 						gboolean _tmp40_ = FALSE;
@@ -2536,7 +2537,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 2540 "SearchFilter.c"
+#line 2541 "SearchFilter.c"
 						}
 					}
 				} else {
@@ -2556,12 +2557,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 2560 "SearchFilter.c"
+#line 2561 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2565 "SearchFilter.c"
+#line 2566 "SearchFilter.c"
 			}
 		}
 	}
@@ -2569,21 +2570,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 2573 "SearchFilter.c"
+#line 2574 "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 2579 "SearchFilter.c"
+#line 2580 "SearchFilter.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = FALSE;
-#line 2583 "SearchFilter.c"
+#line 2584 "SearchFilter.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp44_) {
-#line 2587 "SearchFilter.c"
+#line 2588 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
@@ -2619,7 +2620,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 2623 "SearchFilter.c"
+#line 2624 "SearchFilter.c"
 			Event* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2628,7 +2629,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 2632 "SearchFilter.c"
+#line 2633 "SearchFilter.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp54_ = tag_global;
@@ -2642,7 +2643,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 2646 "SearchFilter.c"
+#line 2647 "SearchFilter.c"
 			GeeList* _tmp59_ = NULL;
 			gint _tmp60_ = 0;
 			gint _tmp61_ = 0;
@@ -2654,17 +2655,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 2658 "SearchFilter.c"
+#line 2659 "SearchFilter.c"
 		} else {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = 0;
-#line 2662 "SearchFilter.c"
+#line 2663 "SearchFilter.c"
 		}
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tags_size = _tmp57_;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp63_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp62_);
-#line 2668 "SearchFilter.c"
+#line 2669 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2676,11 +2677,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 2680 "SearchFilter.c"
+#line 2681 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2684 "SearchFilter.c"
+#line 2685 "SearchFilter.c"
 				{
 					gboolean _tmp64_ = FALSE;
 					const gchar* _tmp65_ = NULL;
@@ -2691,7 +2692,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 2695 "SearchFilter.c"
+#line 2696 "SearchFilter.c"
 						const gchar* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
@@ -2703,23 +2704,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 2707 "SearchFilter.c"
+#line 2708 "SearchFilter.c"
 					} else {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = FALSE;
-#line 2711 "SearchFilter.c"
+#line 2712 "SearchFilter.c"
 					}
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp64_) {
 #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2717 "SearchFilter.c"
+#line 2718 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp70_ = event_keywords;
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp70_ != NULL) {
-#line 2723 "SearchFilter.c"
+#line 2724 "SearchFilter.c"
 						const gchar* _tmp71_ = NULL;
 						const gchar* _tmp72_ = NULL;
 						gboolean _tmp73_ = FALSE;
@@ -2731,40 +2732,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 2735 "SearchFilter.c"
+#line 2736 "SearchFilter.c"
 					} else {
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = FALSE;
-#line 2739 "SearchFilter.c"
+#line 2740 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp69_) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2745 "SearchFilter.c"
+#line 2746 "SearchFilter.c"
 					}
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp74_ = tags_size;
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp74_ > 0) {
-#line 2751 "SearchFilter.c"
+#line 2752 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp90_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2756 "SearchFilter.c"
+#line 2757 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2761 "SearchFilter.c"
+#line 2762 "SearchFilter.c"
 							{
 								gboolean _tmp75_ = FALSE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								_tmp75_ = TRUE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								while (TRUE) {
-#line 2768 "SearchFilter.c"
+#line 2769 "SearchFilter.c"
 									gint _tmp77_ = 0;
 									gint _tmp78_ = 0;
 									const gchar* tag_keywords = NULL;
@@ -2778,13 +2779,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 2782 "SearchFilter.c"
+#line 2783 "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 2788 "SearchFilter.c"
+#line 2789 "SearchFilter.c"
 									}
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = FALSE;
@@ -2796,7 +2797,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 2800 "SearchFilter.c"
+#line 2801 "SearchFilter.c"
 									}
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp79_ = tags;
@@ -2818,7 +2819,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 2822 "SearchFilter.c"
+#line 2823 "SearchFilter.c"
 										const gchar* _tmp87_ = NULL;
 										const gchar* _tmp88_ = NULL;
 										gboolean _tmp89_ = FALSE;
@@ -2830,11 +2831,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 2834 "SearchFilter.c"
+#line 2835 "SearchFilter.c"
 									} else {
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = FALSE;
-#line 2838 "SearchFilter.c"
+#line 2839 "SearchFilter.c"
 									}
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp85_) {
@@ -2842,7 +2843,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 2846 "SearchFilter.c"
+#line 2847 "SearchFilter.c"
 									}
 								}
 							}
@@ -2853,7 +2854,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 2857 "SearchFilter.c"
+#line 2858 "SearchFilter.c"
 						}
 					}
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2866,7 +2867,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 2870 "SearchFilter.c"
+#line 2871 "SearchFilter.c"
 				}
 			}
 		}
@@ -2874,27 +2875,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 2878 "SearchFilter.c"
+#line 2879 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp92_ = criteria;
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp92_) != 0) {
-#line 2884 "SearchFilter.c"
+#line 2885 "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 2890 "SearchFilter.c"
+#line 2891 "SearchFilter.c"
 	} else {
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = FALSE;
-#line 2894 "SearchFilter.c"
+#line 2895 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp91_) {
-#line 2898 "SearchFilter.c"
+#line 2899 "SearchFilter.c"
 		SavedSearch* _tmp94_ = NULL;
 		SavedSearch* _tmp95_ = NULL;
 		MediaSource* _tmp96_ = NULL;
@@ -2913,7 +2914,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 2917 "SearchFilter.c"
+#line 2918 "SearchFilter.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2921,7 +2922,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 2925 "SearchFilter.c"
+#line 2926 "SearchFilter.c"
 }
 
 
@@ -2931,7 +2932,7 @@ DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type
 	self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2935 "SearchFilter.c"
+#line 2936 "SearchFilter.c"
 }
 
 
@@ -2940,7 +2941,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 2944 "SearchFilter.c"
+#line 2945 "SearchFilter.c"
 }
 
 
@@ -2971,7 +2972,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 2975 "SearchFilter.c"
+#line 2976 "SearchFilter.c"
 }
 
 
@@ -2984,7 +2985,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 2988 "SearchFilter.c"
+#line 2989 "SearchFilter.c"
 }
 
 
@@ -2994,14 +2995,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 2998 "SearchFilter.c"
+#line 2999 "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 3005 "SearchFilter.c"
+#line 3006 "SearchFilter.c"
 }
 
 
@@ -3012,7 +3013,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 3016 "SearchFilter.c"
+#line 3017 "SearchFilter.c"
 }
 
 
@@ -3048,14 +3049,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 3052 "SearchFilter.c"
+#line 3053 "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 3059 "SearchFilter.c"
+#line 3060 "SearchFilter.c"
 }
 
 
@@ -3070,7 +3071,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 3074 "SearchFilter.c"
+#line 3075 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -3086,7 +3087,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 3090 "SearchFilter.c"
+#line 3091 "SearchFilter.c"
 	}
 }
 
@@ -3096,7 +3097,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 3100 "SearchFilter.c"
+#line 3101 "SearchFilter.c"
 }
 
 
@@ -3111,7 +3112,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3115 "SearchFilter.c"
+#line 3116 "SearchFilter.c"
 }
 
 
@@ -3126,7 +3127,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 3130 "SearchFilter.c"
+#line 3131 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3137,7 +3138,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 3141 "SearchFilter.c"
+#line 3142 "SearchFilter.c"
 	}
 }
 
@@ -3153,7 +3154,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3157 "SearchFilter.c"
+#line 3158 "SearchFilter.c"
 }
 
 
@@ -3168,7 +3169,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 3172 "SearchFilter.c"
+#line 3173 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3179,7 +3180,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 3183 "SearchFilter.c"
+#line 3184 "SearchFilter.c"
 	}
 }
 
@@ -3195,14 +3196,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3199 "SearchFilter.c"
+#line 3200 "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 3206 "SearchFilter.c"
+#line 3207 "SearchFilter.c"
 }
 
 
@@ -3211,7 +3212,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 3215 "SearchFilter.c"
+#line 3216 "SearchFilter.c"
 	}
 }
 
@@ -3221,11 +3222,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 3225 "SearchFilter.c"
+#line 3226 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3229 "SearchFilter.c"
+#line 3230 "SearchFilter.c"
 	}
 }
 
@@ -3233,37 +3234,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 3237 "SearchFilter.c"
+#line 3238 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 3244 "SearchFilter.c"
+#line 3245 "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 3251 "SearchFilter.c"
+#line 3252 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3255 "SearchFilter.c"
+#line 3256 "SearchFilter.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3259 "SearchFilter.c"
+#line 3260 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3263 "SearchFilter.c"
+#line 3264 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3267 "SearchFilter.c"
+#line 3268 "SearchFilter.c"
 }
 
 
@@ -3274,25 +3275,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 3278 "SearchFilter.c"
+#line 3279 "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 3284 "SearchFilter.c"
+#line 3285 "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 3288 "SearchFilter.c"
+#line 3289 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3292 "SearchFilter.c"
+#line 3293 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3296 "SearchFilter.c"
+#line 3297 "SearchFilter.c"
 }
 
 
@@ -3306,7 +3307,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 3310 "SearchFilter.c"
+#line 3311 "SearchFilter.c"
 }
 
 
@@ -3315,7 +3316,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 3319 "SearchFilter.c"
+#line 3320 "SearchFilter.c"
 }
 
 
@@ -3335,17 +3336,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 3339 "SearchFilter.c"
+#line 3340 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3343 "SearchFilter.c"
+#line 3344 "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 3349 "SearchFilter.c"
+#line 3350 "SearchFilter.c"
 	}
 }
 
@@ -3364,17 +3365,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 3368 "SearchFilter.c"
+#line 3369 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3372 "SearchFilter.c"
+#line 3373 "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 3378 "SearchFilter.c"
+#line 3379 "SearchFilter.c"
 	}
 }
 
@@ -3392,7 +3393,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 3396 "SearchFilter.c"
+#line 3397 "SearchFilter.c"
 }
 
 
@@ -3407,7 +3408,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 3411 "SearchFilter.c"
+#line 3412 "SearchFilter.c"
 }
 
 
@@ -3419,7 +3420,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 3423 "SearchFilter.c"
+#line 3424 "SearchFilter.c"
 }
 
 
@@ -3444,7 +3445,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 3448 "SearchFilter.c"
+#line 3449 "SearchFilter.c"
 }
 
 
@@ -3457,7 +3458,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 3461 "SearchFilter.c"
+#line 3462 "SearchFilter.c"
 	}
 }
 
@@ -3465,56 +3466,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 3469 "SearchFilter.c"
+#line 3470 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
-#line 3476 "SearchFilter.c"
+#line 3477 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
-#line 3483 "SearchFilter.c"
+#line 3484 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
-#line 3490 "SearchFilter.c"
+#line 3491 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
-#line 3497 "SearchFilter.c"
+#line 3498 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
-#line 3504 "SearchFilter.c"
+#line 3505 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
-#line 3511 "SearchFilter.c"
+#line 3512 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
 #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3518 "SearchFilter.c"
+#line 3519 "SearchFilter.c"
 }
 
 
@@ -3534,14 +3535,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 3538 "SearchFilter.c"
+#line 3539 "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 3545 "SearchFilter.c"
+#line 3546 "SearchFilter.c"
 }
 
 
@@ -3556,7 +3557,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3560 "SearchFilter.c"
+#line 3561 "SearchFilter.c"
 }
 
 
@@ -3574,13 +3575,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 3578 "SearchFilter.c"
+#line 3579 "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 3584 "SearchFilter.c"
+#line 3585 "SearchFilter.c"
 }
 
 
@@ -3602,7 +3603,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 3606 "SearchFilter.c"
+#line 3607 "SearchFilter.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
@@ -3610,7 +3611,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 3614 "SearchFilter.c"
+#line 3615 "SearchFilter.c"
 		LibraryWindow* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		GAction* _tmp5_ = NULL;
@@ -3626,7 +3627,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 3630 "SearchFilter.c"
+#line 3631 "SearchFilter.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
@@ -3634,7 +3635,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 3638 "SearchFilter.c"
+#line 3639 "SearchFilter.c"
 }
 
 
@@ -3660,7 +3661,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 3664 "SearchFilter.c"
+#line 3665 "SearchFilter.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3669,46 +3670,46 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 		_tmp5_ = sensitive;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3673 "SearchFilter.c"
+#line 3674 "SearchFilter.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3677 "SearchFilter.c"
+#line 3678 "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"
+#line 3685 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new33 (gboolean value) {
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3691 "SearchFilter.c"
+#line 3692 "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"
+#line 3699 "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"
+#line 3706 "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 3712 "SearchFilter.c"
+#line 3713 "SearchFilter.c"
 }
 
 
@@ -3802,7 +3803,7 @@ void search_filter_actions_reset (SearchFilterActions* self) {
 	text_action_set_text (_tmp19_, NULL);
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3806 "SearchFilter.c"
+#line 3807 "SearchFilter.c"
 }
 
 
@@ -3818,21 +3819,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 3822 "SearchFilter.c"
+#line 3823 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3829 "SearchFilter.c"
+#line 3830 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3836 "SearchFilter.c"
+#line 3837 "SearchFilter.c"
 }
 
 
@@ -3861,7 +3862,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 3865 "SearchFilter.c"
+#line 3866 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_ = NULL;
 		CoreViewTracker* _tmp4_ = NULL;
@@ -3876,7 +3877,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 3880 "SearchFilter.c"
+#line 3881 "SearchFilter.c"
 			CoreViewTracker* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3885,14 +3886,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 3889 "SearchFilter.c"
+#line 3890 "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 3896 "SearchFilter.c"
+#line 3897 "SearchFilter.c"
 				CoreViewTracker* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3901,12 +3902,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 3905 "SearchFilter.c"
+#line 3906 "SearchFilter.c"
 			}
 		}
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3910 "SearchFilter.c"
+#line 3911 "SearchFilter.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
@@ -3918,7 +3919,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 3922 "SearchFilter.c"
+#line 3923 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_ = NULL;
 		CoreViewTracker* _tmp15_ = NULL;
@@ -3935,7 +3936,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 3939 "SearchFilter.c"
+#line 3940 "SearchFilter.c"
 			CoreViewTracker* _tmp17_ = NULL;
 			CoreViewTracker* _tmp18_ = NULL;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3954,14 +3955,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 3958 "SearchFilter.c"
+#line 3959 "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 3965 "SearchFilter.c"
+#line 3966 "SearchFilter.c"
 				CoreViewTracker* _tmp20_ = NULL;
 				CoreViewTracker* _tmp21_ = NULL;
 #line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3980,12 +3981,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 3984 "SearchFilter.c"
+#line 3985 "SearchFilter.c"
 			}
 		}
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3989 "SearchFilter.c"
+#line 3990 "SearchFilter.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
@@ -4003,14 +4004,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 4007 "SearchFilter.c"
+#line 4008 "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 4014 "SearchFilter.c"
+#line 4015 "SearchFilter.c"
 }
 
 
@@ -4064,7 +4065,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 4068 "SearchFilter.c"
+#line 4069 "SearchFilter.c"
 }
 
 
@@ -4121,7 +4122,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 4125 "SearchFilter.c"
+#line 4126 "SearchFilter.c"
 }
 
 
@@ -4161,7 +4162,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 4165 "SearchFilter.c"
+#line 4166 "SearchFilter.c"
 }
 
 
@@ -4175,7 +4176,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 4179 "SearchFilter.c"
+#line 4180 "SearchFilter.c"
 }
 
 
@@ -4192,21 +4193,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 4196 "SearchFilter.c"
+#line 4197 "SearchFilter.c"
 }
 
 
 static gboolean _variant_get37 (GVariant* value) {
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4203 "SearchFilter.c"
+#line 4204 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new38 (gboolean value) {
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4210 "SearchFilter.c"
+#line 4211 "SearchFilter.c"
 }
 
 
@@ -4245,7 +4246,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4249 "SearchFilter.c"
+#line 4250 "SearchFilter.c"
 }
 
 
@@ -4259,7 +4260,7 @@ static void search_filter_actions_register (SearchFilterActions* self) {
 	_text_action_unref0 (self->priv->_text);
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = _tmp0_;
-#line 4263 "SearchFilter.c"
+#line 4264 "SearchFilter.c"
 }
 
 
@@ -4304,7 +4305,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	if (_tmp6_) {
 #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 4308 "SearchFilter.c"
+#line 4309 "SearchFilter.c"
 	}
 #line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = value;
@@ -4324,7 +4325,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	_tmp12_ = filter;
 #line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "rating-changed", _tmp12_);
-#line 4328 "SearchFilter.c"
+#line 4329 "SearchFilter.c"
 }
 
 
@@ -4351,7 +4352,7 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "flagged-toggled", _tmp3_);
-#line 4355 "SearchFilter.c"
+#line 4356 "SearchFilter.c"
 }
 
 
@@ -4378,7 +4379,7 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "photos-toggled", _tmp3_);
-#line 4382 "SearchFilter.c"
+#line 4383 "SearchFilter.c"
 }
 
 
@@ -4405,7 +4406,7 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "videos-toggled", _tmp3_);
-#line 4409 "SearchFilter.c"
+#line 4410 "SearchFilter.c"
 }
 
 
@@ -4432,7 +4433,7 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "raw-toggled", _tmp3_);
-#line 4436 "SearchFilter.c"
+#line 4437 "SearchFilter.c"
 }
 
 
@@ -4447,7 +4448,7 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4451 "SearchFilter.c"
+#line 4452 "SearchFilter.c"
 }
 
 
@@ -4462,7 +4463,7 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4466 "SearchFilter.c"
+#line 4467 "SearchFilter.c"
 }
 
 
@@ -4477,7 +4478,7 @@ gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4481 "SearchFilter.c"
+#line 4482 "SearchFilter.c"
 }
 
 
@@ -4492,7 +4493,7 @@ gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4496 "SearchFilter.c"
+#line 4497 "SearchFilter.c"
 }
 
 
@@ -4507,7 +4508,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4511 "SearchFilter.c"
+#line 4512 "SearchFilter.c"
 }
 
 
@@ -4522,7 +4523,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4526 "SearchFilter.c"
+#line 4527 "SearchFilter.c"
 }
 
 
@@ -4537,7 +4538,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4541 "SearchFilter.c"
+#line 4542 "SearchFilter.c"
 }
 
 
@@ -4552,7 +4553,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4556 "SearchFilter.c"
+#line 4557 "SearchFilter.c"
 }
 
 
@@ -4567,7 +4568,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4571 "SearchFilter.c"
+#line 4572 "SearchFilter.c"
 }
 
 
@@ -4587,7 +4588,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4591 "SearchFilter.c"
+#line 4592 "SearchFilter.c"
 }
 
 
@@ -4606,26 +4607,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 4610 "SearchFilter.c"
+#line 4611 "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 4616 "SearchFilter.c"
+#line 4617 "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 4622 "SearchFilter.c"
+#line 4623 "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 4629 "SearchFilter.c"
+#line 4630 "SearchFilter.c"
 }
 
 
@@ -4634,7 +4635,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 4638 "SearchFilter.c"
+#line 4639 "SearchFilter.c"
 	}
 }
 
@@ -4644,11 +4645,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 4648 "SearchFilter.c"
+#line 4649 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4652 "SearchFilter.c"
+#line 4653 "SearchFilter.c"
 	}
 }
 
@@ -4656,37 +4657,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 4660 "SearchFilter.c"
+#line 4661 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 4667 "SearchFilter.c"
+#line 4668 "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 4674 "SearchFilter.c"
+#line 4675 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4678 "SearchFilter.c"
+#line 4679 "SearchFilter.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4682 "SearchFilter.c"
+#line 4683 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4686 "SearchFilter.c"
+#line 4687 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4690 "SearchFilter.c"
+#line 4691 "SearchFilter.c"
 }
 
 
@@ -4697,25 +4698,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 4701 "SearchFilter.c"
+#line 4702 "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 4707 "SearchFilter.c"
+#line 4708 "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 4711 "SearchFilter.c"
+#line 4712 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4715 "SearchFilter.c"
+#line 4716 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4719 "SearchFilter.c"
+#line 4720 "SearchFilter.c"
 }
 
 
@@ -4729,7 +4730,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 4733 "SearchFilter.c"
+#line 4734 "SearchFilter.c"
 }
 
 
@@ -4738,7 +4739,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 4742 "SearchFilter.c"
+#line 4743 "SearchFilter.c"
 }
 
 
@@ -4758,17 +4759,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 4762 "SearchFilter.c"
+#line 4763 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4766 "SearchFilter.c"
+#line 4767 "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 4772 "SearchFilter.c"
+#line 4773 "SearchFilter.c"
 	}
 }
 
@@ -4787,17 +4788,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 4791 "SearchFilter.c"
+#line 4792 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4795 "SearchFilter.c"
+#line 4796 "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 4801 "SearchFilter.c"
+#line 4802 "SearchFilter.c"
 	}
 }
 
@@ -4821,7 +4822,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 4825 "SearchFilter.c"
+#line 4826 "SearchFilter.c"
 	/**
 	     * fired when the kinds of media present in the current view change (e.g., a video becomes
 	     * available in the view through a new import operation or no raw photos are available in
@@ -4831,7 +4832,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 4835 "SearchFilter.c"
+#line 4836 "SearchFilter.c"
 }
 
 
@@ -4854,7 +4855,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 4858 "SearchFilter.c"
+#line 4859 "SearchFilter.c"
 }
 
 
@@ -4866,7 +4867,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 4870 "SearchFilter.c"
+#line 4871 "SearchFilter.c"
 }
 
 
@@ -4891,7 +4892,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 4895 "SearchFilter.c"
+#line 4896 "SearchFilter.c"
 }
 
 
@@ -4904,7 +4905,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 4908 "SearchFilter.c"
+#line 4909 "SearchFilter.c"
 	}
 }
 
@@ -4912,56 +4913,56 @@ void search_filter_actions_unref (gpointer instance) {
 static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self) {
 #line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged);
-#line 4916 "SearchFilter.c"
+#line 4917 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4923 "SearchFilter.c"
+#line 4924 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4930 "SearchFilter.c"
+#line 4931 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4937 "SearchFilter.c"
+#line 4938 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4944 "SearchFilter.c"
+#line 4945 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
 #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4951 "SearchFilter.c"
+#line 4952 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
 #line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4958 "SearchFilter.c"
+#line 4959 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
 #line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4965 "SearchFilter.c"
+#line 4966 "SearchFilter.c"
 }
 
 
@@ -4970,28 +4971,28 @@ static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_pop
 	result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number);
 #line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4974 "SearchFilter.c"
+#line 4975 "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 4981 "SearchFilter.c"
+#line 4982 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4988 "SearchFilter.c"
+#line 4989 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self) {
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4995 "SearchFilter.c"
+#line 4996 "SearchFilter.c"
 }
 
 
@@ -5007,87 +5008,87 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	SearchFilterToolbarSearchBox* _tmp7_ = NULL;
 	GtkToolbar* _tmp8_ = NULL;
 	GtkToolbar* _tmp9_ = NULL;
-	GtkMenuItem* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
 	GtkMenuItem* _tmp18_ = NULL;
-	GtkMenuItem* _tmp19_ = NULL;
-	GtkMenu* _tmp20_ = NULL;
+	const gchar* _tmp19_ = NULL;
+	GtkMenuItem* _tmp20_ = NULL;
 	GtkMenuItem* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp23_ = NULL;
-	GtkToolbar* _tmp24_ = NULL;
+	GtkMenu* _tmp22_ = NULL;
+	GtkMenuItem* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
 	SearchFilterToolbarLabelToolItem* _tmp25_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp26_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
+	GtkToolbar* _tmp26_ = NULL;
+	SearchFilterToolbarLabelToolItem* _tmp27_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp28_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp29_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
+	const gchar* _tmp30_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp31_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp32_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkToolbar* _tmp35_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp36_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp34_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
 	GtkToolbar* _tmp37_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp38_ = NULL;
 	GtkToolbar* _tmp39_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp40_ = NULL;
-	GtkSeparatorToolItem* _tmp41_ = NULL;
-	GtkToolbar* _tmp42_ = NULL;
+	GtkToolbar* _tmp41_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp42_ = NULL;
 	GtkSeparatorToolItem* _tmp43_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp44_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp45_ = NULL;
-	const gchar* _tmp46_ = NULL;
+	GtkToolbar* _tmp44_ = NULL;
+	GtkSeparatorToolItem* _tmp45_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp46_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp47_ = NULL;
 	const gchar* _tmp48_ = NULL;
-	GtkToolbar* _tmp49_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp50_ = NULL;
-	GtkSeparatorToolItem* _tmp51_ = NULL;
-	GtkToolbar* _tmp52_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp49_ = NULL;
+	const gchar* _tmp50_ = NULL;
+	GtkToolbar* _tmp51_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp52_ = NULL;
 	GtkSeparatorToolItem* _tmp53_ = NULL;
+	GtkToolbar* _tmp54_ = NULL;
+	GtkSeparatorToolItem* _tmp55_ = NULL;
 	GMenuModel* model = NULL;
-	GtkBuilder* _tmp54_ = NULL;
-	GObject* _tmp55_ = NULL;
-	GMenuModel* _tmp56_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp57_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
+	GtkBuilder* _tmp56_ = NULL;
+	GObject* _tmp57_ = NULL;
+	GMenuModel* _tmp58_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp59_ = NULL;
 	SearchFilterToolbarRatingFilterButton* _tmp60_ = NULL;
-	GtkToolbar* _tmp61_ = NULL;
+	const gchar* _tmp61_ = NULL;
 	SearchFilterToolbarRatingFilterButton* _tmp62_ = NULL;
-	GtkSeparatorToolItem* _tmp63_ = NULL;
-	GtkToolbar* _tmp64_ = NULL;
+	GtkToolbar* _tmp63_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp64_ = NULL;
 	GtkSeparatorToolItem* _tmp65_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp66_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp67_ = NULL;
-	const gchar* _tmp68_ = NULL;
+	GtkToolbar* _tmp66_ = NULL;
+	GtkSeparatorToolItem* _tmp67_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp68_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp69_ = NULL;
 	const gchar* _tmp70_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp71_ = NULL;
-	GtkToolbar* _tmp72_ = NULL;
+	const gchar* _tmp72_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp73_ = NULL;
+	GtkToolbar* _tmp74_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp75_ = NULL;
 	GtkSeparatorToolItem* separator_align = NULL;
-	GtkSeparatorToolItem* _tmp74_ = NULL;
-	GtkToolbar* _tmp75_ = NULL;
-	GtkToolbar* _tmp76_ = NULL;
-	SearchFilterToolbarSearchBox* _tmp77_ = NULL;
+	GtkSeparatorToolItem* _tmp76_ = NULL;
+	GtkToolbar* _tmp77_ = NULL;
 	GtkToolbar* _tmp78_ = NULL;
-	SearchFilterActions* _tmp79_ = NULL;
-	SearchFilterActions* _tmp80_ = NULL;
+	SearchFilterToolbarSearchBox* _tmp79_ = NULL;
+	GtkToolbar* _tmp80_ = NULL;
 	SearchFilterActions* _tmp81_ = NULL;
 	SearchFilterActions* _tmp82_ = NULL;
 	SearchFilterActions* _tmp83_ = NULL;
 	SearchFilterActions* _tmp84_ = NULL;
 	SearchFilterActions* _tmp85_ = NULL;
-	GtkToolbar* _tmp86_ = NULL;
+	SearchFilterActions* _tmp86_ = NULL;
 	SearchFilterActions* _tmp87_ = NULL;
-	gboolean _tmp88_ = FALSE;
+	GtkToolbar* _tmp88_ = NULL;
 	SearchFilterActions* _tmp89_ = NULL;
 	gboolean _tmp90_ = FALSE;
 	SearchFilterActions* _tmp91_ = NULL;
 	gboolean _tmp92_ = FALSE;
 	SearchFilterActions* _tmp93_ = NULL;
 	gboolean _tmp94_ = FALSE;
+	SearchFilterActions* _tmp95_ = NULL;
+	gboolean _tmp96_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL);
@@ -5135,51 +5136,59 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_tmp9_ = self->priv->toolbar;
 #line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5139 "SearchFilter.c"
+#line 5140 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->builder;
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_builder_add_from_resource (_tmp10_, "/org/gnome/Shotwell/search_bar.ui", &_inner_error_);
+		_tmp11_ = resources_get_ui ("search_bar.ui");
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp12_ = _tmp11_;
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_builder_add_from_resource (_tmp10_, _tmp12_, &_inner_error_);
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_free0 (_tmp12_);
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5148 "SearchFilter.c"
-			goto __catch590_g_error;
+#line 5157 "SearchFilter.c"
+			goto __catch592_g_error;
 		}
 	}
-	goto __finally590;
-	__catch590_g_error:
+	goto __finally592;
+	__catch592_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		GError* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		err = _inner_error_;
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_inner_error_ = NULL;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp11_ = _ ("Error loading search bar UI: %s");
+		_tmp13_ = _ ("Error loading search bar UI: %s");
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp12_ = err;
+		_tmp14_ = err;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = _tmp12_->message;
+		_tmp15_ = _tmp14_->message;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = g_strdup_printf (_tmp11_, _tmp13_);
+		_tmp16_ = g_strdup_printf (_tmp13_, _tmp15_);
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp15_ = _tmp14_;
+		_tmp17_ = _tmp16_;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		app_window_panic (_tmp15_);
+		app_window_panic (_tmp17_);
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp17_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5181 "SearchFilter.c"
+#line 5190 "SearchFilter.c"
 	}
-	__finally590:
+	__finally592:
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5188,318 +5197,318 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5192 "SearchFilter.c"
+#line 5201 "SearchFilter.c"
 	}
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp16_ = self->priv->close_item;
+	_tmp18_ = self->priv->close_item;
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_ = _ ("Close");
+	_tmp19_ = _ ("Close");
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_item_set_label (_tmp16_, _tmp17_);
+	gtk_menu_item_set_label (_tmp18_, _tmp19_);
 #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = self->priv->close_item;
+	_tmp20_ = self->priv->close_item;
 #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = self->priv->close_item;
+	_tmp21_ = self->priv->close_item;
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp19_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
+	g_signal_connect_object (_tmp21_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = self->priv->close_menu;
+	_tmp22_ = self->priv->close_menu;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = self->priv->close_item;
+	_tmp23_ = self->priv->close_item;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp21_);
+	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp23_);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = _ ("Type");
+	_tmp24_ = _ ("Type");
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = search_filter_toolbar_label_tool_item_new (_tmp22_, 10, 5);
+	_tmp25_ = search_filter_toolbar_label_tool_item_new (_tmp24_, 10, 5);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp25_);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->label_type = _tmp23_;
+	self->priv->label_type = _tmp25_;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = self->priv->toolbar;
+	_tmp26_ = self->priv->toolbar;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = self->priv->label_type;
+	_tmp27_ = self->priv->label_type;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
+	_tmp28_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp28_);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_photos = _tmp26_;
+	self->priv->toolbtn_photos = _tmp28_;
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_ = self->priv->toolbtn_photos;
+	_tmp29_ = self->priv->toolbtn_photos;
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = _ ("Photos");
+	_tmp30_ = _ ("Photos");
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), _tmp28_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), _tmp30_);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
+	_tmp31_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp29_);
+	g_object_ref_sink (_tmp31_);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_videos = _tmp29_;
+	self->priv->toolbtn_videos = _tmp31_;
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = self->priv->toolbtn_videos;
+	_tmp32_ = self->priv->toolbtn_videos;
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = _ ("Videos");
+	_tmp33_ = _ ("Videos");
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_item_get_type (), GtkToolItem), _tmp31_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), _tmp33_);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
+	_tmp34_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp32_);
+	g_object_ref_sink (_tmp34_);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_raw = _tmp32_;
+	self->priv->toolbtn_raw = _tmp34_;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = self->priv->toolbtn_raw;
+	_tmp35_ = self->priv->toolbtn_raw;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = _ ("RAW Photos");
+	_tmp36_ = _ ("RAW Photos");
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), _tmp34_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), _tmp36_);
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = self->priv->toolbar;
+	_tmp37_ = self->priv->toolbar;
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = self->priv->toolbtn_photos;
+	_tmp38_ = self->priv->toolbtn_photos;
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = self->priv->toolbar;
+	_tmp39_ = self->priv->toolbar;
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = self->priv->toolbtn_videos;
+	_tmp40_ = self->priv->toolbtn_videos;
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->toolbar;
+	_tmp41_ = self->priv->toolbar;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_ = self->priv->toolbtn_raw;
+	_tmp42_ = self->priv->toolbtn_raw;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp43_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp41_);
+	g_object_ref_sink (_tmp43_);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_mediatype_flagged = _tmp41_;
+	self->priv->sepr_mediatype_flagged = _tmp43_;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = self->priv->toolbar;
+	_tmp44_ = self->priv->toolbar;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = self->priv->sepr_mediatype_flagged;
+	_tmp45_ = self->priv->sepr_mediatype_flagged;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
+	_tmp46_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp44_);
+	g_object_ref_sink (_tmp46_);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_flag = _tmp44_;
+	self->priv->toolbtn_flag = _tmp46_;
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = self->priv->toolbtn_flag;
+	_tmp47_ = self->priv->toolbtn_flag;
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = _ ("Flagged");
+	_tmp48_ = _ ("Flagged");
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp45_, _tmp46_);
+	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp47_, _tmp48_);
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = self->priv->toolbtn_flag;
+	_tmp49_ = self->priv->toolbtn_flag;
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = _ ("Flagged");
+	_tmp50_ = _ ("Flagged");
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), _tmp48_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), _tmp50_);
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = self->priv->toolbar;
+	_tmp51_ = self->priv->toolbar;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_ = self->priv->toolbtn_flag;
+	_tmp52_ = self->priv->toolbtn_flag;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp51_);
+	g_object_ref_sink (_tmp53_);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_flagged_rating = _tmp51_;
+	self->priv->sepr_flagged_rating = _tmp53_;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = self->priv->toolbar;
+	_tmp54_ = self->priv->toolbar;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = self->priv->sepr_flagged_rating;
+	_tmp55_ = self->priv->sepr_flagged_rating;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = self->builder;
+	_tmp56_ = self->builder;
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_ = gtk_builder_get_object (_tmp54_, "popup-menu");
+	_tmp57_ = gtk_builder_get_object (_tmp56_, "popup-menu");
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp55_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp55_) : NULL);
+	_tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp57_) : NULL);
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	model = _tmp56_;
+	model = _tmp58_;
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = search_filter_toolbar_rating_filter_button_new (model);
+	_tmp59_ = search_filter_toolbar_rating_filter_button_new (model);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp57_);
+	g_object_ref_sink (_tmp59_);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->rating_button);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->rating_button = _tmp57_;
+	self->priv->rating_button = _tmp59_;
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = self->priv->rating_button;
+	_tmp60_ = self->priv->rating_button;
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = _ ("Rating");
+	_tmp61_ = _ ("Rating");
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_set_label (_tmp58_, _tmp59_);
+	search_filter_toolbar_rating_filter_button_set_label (_tmp60_, _tmp61_);
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = self->priv->rating_button;
+	_tmp62_ = self->priv->rating_button;
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = self->priv->toolbar;
+	_tmp63_ = self->priv->toolbar;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp62_ = self->priv->rating_button;
+	_tmp64_ = self->priv->rating_button;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp63_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp65_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp63_);
+	g_object_ref_sink (_tmp65_);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_rating_saved = _tmp63_;
+	self->priv->sepr_rating_saved = _tmp65_;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp64_ = self->priv->toolbar;
+	_tmp66_ = self->priv->toolbar;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp65_ = self->priv->sepr_rating_saved;
+	_tmp67_ = self->priv->sepr_rating_saved;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp66_ = self->priv->saved_search_button;
+	_tmp68_ = self->priv->saved_search_button;
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp67_ = self->priv->saved_search_button;
+	_tmp69_ = self->priv->saved_search_button;
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp68_ = _ ("Saved Search");
+	_tmp70_ = _ ("Saved Search");
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_saved_search_filter_button_set_label (_tmp67_, _tmp68_);
+	search_filter_toolbar_saved_search_filter_button_set_label (_tmp69_, _tmp70_);
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp69_ = self->priv->saved_search_button;
+	_tmp71_ = self->priv->saved_search_button;
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp70_ = _ ("Use a saved search to filter items in the current view");
+	_tmp72_ = _ ("Use a saved search to filter items in the current view");
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_tool_item_get_type (), GtkToolItem), _tmp70_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), _tmp72_);
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp71_ = self->priv->saved_search_button;
+	_tmp73_ = self->priv->saved_search_button;
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
+	g_signal_connect_object (_tmp73_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp72_ = self->priv->toolbar;
+	_tmp74_ = self->priv->toolbar;
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp73_ = self->priv->saved_search_button;
+	_tmp75_ = self->priv->saved_search_button;
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp74_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp76_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp74_);
+	g_object_ref_sink (_tmp76_);
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	separator_align = _tmp74_;
+	separator_align = _tmp76_;
 #line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_separator_tool_item_set_draw (separator_align, FALSE);
 #line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp75_ = self->priv->toolbar;
+	_tmp77_ = self->priv->toolbar;
 #line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp76_ = self->priv->toolbar;
+	_tmp78_ = self->priv->toolbar;
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp77_ = self->priv->search_box;
+	_tmp79_ = self->priv->search_box;
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp78_ = self->priv->toolbar;
+	_tmp80_ = self->priv->toolbar;
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp79_ = actions;
+	_tmp81_ = actions;
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp79_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
+	g_signal_connect_object (_tmp81_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp80_ = actions;
+	_tmp82_ = actions;
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp80_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
+	g_signal_connect_object (_tmp82_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp81_ = actions;
+	_tmp83_ = actions;
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp81_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
+	g_signal_connect_object (_tmp83_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
 #line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp82_ = actions;
+	_tmp84_ = actions;
 #line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp82_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
+	g_signal_connect_object (_tmp84_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp83_ = actions;
+	_tmp85_ = actions;
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp83_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
+	g_signal_connect_object (_tmp85_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp84_ = actions;
+	_tmp86_ = actions;
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp84_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
+	g_signal_connect_object (_tmp86_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
 #line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp85_ = actions;
+	_tmp87_ = actions;
 #line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp85_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
+	g_signal_connect_object (_tmp87_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
 #line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp86_ = self->priv->toolbar;
+	_tmp88_ = self->priv->toolbar;
 #line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp86_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp87_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp88_ = search_filter_actions_get_has_photos (_tmp87_);
+	g_signal_connect_object (_tmp88_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp89_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp90_ = search_filter_actions_get_has_videos (_tmp89_);
+	_tmp90_ = search_filter_actions_get_has_photos (_tmp89_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp91_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp92_ = search_filter_actions_get_has_raw (_tmp91_);
+	_tmp92_ = search_filter_actions_get_has_videos (_tmp91_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp94_ = search_filter_actions_get_has_flagged (_tmp93_);
+	_tmp94_ = search_filter_actions_get_has_raw (_tmp93_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_on_media_context_changed (self, _tmp88_, _tmp90_, _tmp92_, _tmp94_);
+	_tmp95_ = actions;
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp96_ = search_filter_actions_get_has_flagged (_tmp95_);
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_on_media_context_changed (self, _tmp90_, _tmp92_, _tmp94_, _tmp96_);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (separator_align);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (model);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 5496 "SearchFilter.c"
+#line 5505 "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 5503 "SearchFilter.c"
+#line 5512 "SearchFilter.c"
 }
 
 
@@ -5514,77 +5523,77 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	_tmp0_ = has_photos;
 #line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5518 "SearchFilter.c"
+#line 5527 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = self->priv->toolbtn_photos;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 5524 "SearchFilter.c"
+#line 5533 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 5531 "SearchFilter.c"
+#line 5540 "SearchFilter.c"
 	}
 #line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = has_videos;
 #line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 5537 "SearchFilter.c"
+#line 5546 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_videos;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 5543 "SearchFilter.c"
+#line 5552 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 5550 "SearchFilter.c"
+#line 5559 "SearchFilter.c"
 	}
 #line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = has_raw;
 #line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 5556 "SearchFilter.c"
+#line 5565 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_raw;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
-#line 5562 "SearchFilter.c"
+#line 5571 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 5569 "SearchFilter.c"
+#line 5578 "SearchFilter.c"
 	}
 #line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = has_flagged;
 #line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp9_) {
-#line 5575 "SearchFilter.c"
+#line 5584 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_flag;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 5581 "SearchFilter.c"
+#line 5590 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
 #line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = self->priv->toolbtn_flag;
 #line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 5588 "SearchFilter.c"
+#line 5597 "SearchFilter.c"
 	}
 }
 
@@ -5608,14 +5617,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	result = FALSE;
 #line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5612 "SearchFilter.c"
+#line 5621 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5619 "SearchFilter.c"
+#line 5628 "SearchFilter.c"
 }
 
 
@@ -5645,7 +5654,7 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	_tmp4_ = action;
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5649 "SearchFilter.c"
+#line 5658 "SearchFilter.c"
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5656,13 +5665,13 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5660 "SearchFilter.c"
+#line 5669 "SearchFilter.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5666 "SearchFilter.c"
+#line 5675 "SearchFilter.c"
 }
 
 
@@ -5671,7 +5680,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5675 "SearchFilter.c"
+#line 5684 "SearchFilter.c"
 }
 
 
@@ -5680,7 +5689,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5684 "SearchFilter.c"
+#line 5693 "SearchFilter.c"
 }
 
 
@@ -5689,7 +5698,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5693 "SearchFilter.c"
+#line 5702 "SearchFilter.c"
 }
 
 
@@ -5698,7 +5707,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5702 "SearchFilter.c"
+#line 5711 "SearchFilter.c"
 }
 
 
@@ -5707,14 +5716,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5711 "SearchFilter.c"
+#line 5720 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5718 "SearchFilter.c"
+#line 5727 "SearchFilter.c"
 }
 
 
@@ -5741,7 +5750,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		_g_object_unref0 (aw);
 #line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5745 "SearchFilter.c"
+#line 5754 "SearchFilter.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
@@ -5755,7 +5764,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_tmp5_ = action;
 #line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5759 "SearchFilter.c"
+#line 5768 "SearchFilter.c"
 		GSimpleAction* _tmp6_ = NULL;
 		GVariant* _tmp7_ = NULL;
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5766,7 +5775,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5770 "SearchFilter.c"
+#line 5779 "SearchFilter.c"
 	}
 #line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
@@ -5774,7 +5783,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_g_object_unref0 (action);
 #line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5778 "SearchFilter.c"
+#line 5787 "SearchFilter.c"
 }
 
 
@@ -5783,14 +5792,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5787 "SearchFilter.c"
+#line 5796 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5794 "SearchFilter.c"
+#line 5803 "SearchFilter.c"
 }
 
 
@@ -5817,7 +5826,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	if (_tmp0_ == _tmp1_) {
 #line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5821 "SearchFilter.c"
+#line 5830 "SearchFilter.c"
 	}
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
@@ -5845,7 +5854,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0);
 #line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5849 "SearchFilter.c"
+#line 5858 "SearchFilter.c"
 }
 
 
@@ -5862,7 +5871,7 @@ void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
 	search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 5866 "SearchFilter.c"
+#line 5875 "SearchFilter.c"
 }
 
 
@@ -5955,7 +5964,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5959 "SearchFilter.c"
+#line 5968 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5966,7 +5975,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		library_window_show_search_bar (_tmp2_, TRUE);
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5970 "SearchFilter.c"
+#line 5979 "SearchFilter.c"
 	}
 #line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
@@ -6158,7 +6167,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp73_ = _tmp72_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6162 "SearchFilter.c"
+#line 6171 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
 		gboolean _tmp76_ = FALSE;
@@ -6170,11 +6179,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp76_ = _tmp75_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6174 "SearchFilter.c"
+#line 6183 "SearchFilter.c"
 	} else {
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6178 "SearchFilter.c"
+#line 6187 "SearchFilter.c"
 	}
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
@@ -6188,7 +6197,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp82_ = _tmp81_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6192 "SearchFilter.c"
+#line 6201 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
 		gboolean _tmp84_ = FALSE;
 		gboolean _tmp85_ = FALSE;
@@ -6200,17 +6209,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp85_ = _tmp84_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6204 "SearchFilter.c"
+#line 6213 "SearchFilter.c"
 	} else {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6208 "SearchFilter.c"
+#line 6217 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6214 "SearchFilter.c"
+#line 6223 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
 		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
@@ -6224,7 +6233,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp89_ = _tmp88_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6228 "SearchFilter.c"
+#line 6237 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
 			gboolean _tmp91_ = FALSE;
 			gboolean _tmp92_ = FALSE;
@@ -6236,15 +6245,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 			_tmp92_ = _tmp91_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6240 "SearchFilter.c"
+#line 6249 "SearchFilter.c"
 		} else {
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6244 "SearchFilter.c"
+#line 6253 "SearchFilter.c"
 		}
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6248 "SearchFilter.c"
+#line 6257 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
@@ -6254,7 +6263,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp94_ = self->priv->search_filter;
 #line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6258 "SearchFilter.c"
+#line 6267 "SearchFilter.c"
 }
 
 
@@ -6275,7 +6284,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar*
 	self->priv->saved_search = _tmp1_;
 #line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6279 "SearchFilter.c"
+#line 6288 "SearchFilter.c"
 }
 
 
@@ -6288,7 +6297,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self
 	self->priv->saved_search = NULL;
 #line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6292 "SearchFilter.c"
+#line 6301 "SearchFilter.c"
 }
 
 
@@ -6318,7 +6327,7 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	saved_search_dialog_show (ssd);
 #line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 6322 "SearchFilter.c"
+#line 6331 "SearchFilter.c"
 }
 
 
@@ -6343,7 +6352,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
 #line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6347 "SearchFilter.c"
+#line 6356 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		SavedSearch* _tmp6_ = NULL;
@@ -6365,7 +6374,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		_g_object_unref0 (_tmp8_);
 #line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6369 "SearchFilter.c"
+#line 6378 "SearchFilter.c"
 	}
 }
 
@@ -6391,7 +6400,7 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	saved_search_dialog_show (_tmp3_);
 #line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 6395 "SearchFilter.c"
+#line 6404 "SearchFilter.c"
 }
 
 
@@ -6416,42 +6425,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	_tmp3_ = _tmp2_->filter_popup;
 #line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6420 "SearchFilter.c"
+#line 6429 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6427 "SearchFilter.c"
+#line 6436 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6434 "SearchFilter.c"
+#line 6443 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6441 "SearchFilter.c"
+#line 6450 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6448 "SearchFilter.c"
+#line 6457 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6455 "SearchFilter.c"
+#line 6464 "SearchFilter.c"
 }
 
 
@@ -6464,28 +6473,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 	_tmp1_ = self->priv->elide_showing_again;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6468 "SearchFilter.c"
+#line 6477 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6474 "SearchFilter.c"
+#line 6483 "SearchFilter.c"
 	} else {
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6478 "SearchFilter.c"
+#line 6487 "SearchFilter.c"
 	}
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6482 "SearchFilter.c"
+#line 6491 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6489 "SearchFilter.c"
+#line 6498 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
@@ -6497,7 +6506,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
 #line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6501 "SearchFilter.c"
+#line 6510 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
@@ -6522,7 +6531,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp6_ = _tmp5_->filter_popup;
 #line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6526 "SearchFilter.c"
+#line 6535 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
 				guint _tmp9_ = 0U;
@@ -6578,7 +6587,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
 #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self);
-#line 6582 "SearchFilter.c"
+#line 6591 "SearchFilter.c"
 			}
 #line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
@@ -6626,12 +6635,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp36_ = _tmp35_->filter_popup;
 #line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6630 "SearchFilter.c"
+#line 6639 "SearchFilter.c"
 		}
 	}
 #line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6635 "SearchFilter.c"
+#line 6644 "SearchFilter.c"
 }
 
 
@@ -6643,7 +6652,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_box;
 #line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6647 "SearchFilter.c"
+#line 6656 "SearchFilter.c"
 }
 
 
@@ -6674,18 +6683,18 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	if (_tmp3_ != 0) {
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6678 "SearchFilter.c"
+#line 6687 "SearchFilter.c"
 	} else {
 		gint _tmp4_ = 0;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6685 "SearchFilter.c"
+#line 6694 "SearchFilter.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6689 "SearchFilter.c"
+#line 6698 "SearchFilter.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkLabel* _tmp6_ = NULL;
 		GtkLabel* _tmp7_ = NULL;
@@ -6712,7 +6721,7 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 		_tmp10_ = right_padding;
 #line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 6716 "SearchFilter.c"
+#line 6725 "SearchFilter.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
@@ -6720,14 +6729,14 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
 #line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6724 "SearchFilter.c"
+#line 6733 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
 #line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding);
-#line 6731 "SearchFilter.c"
+#line 6740 "SearchFilter.c"
 }
 
 
@@ -6738,14 +6747,14 @@ static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolba
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6742 "SearchFilter.c"
+#line 6751 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6749 "SearchFilter.c"
+#line 6758 "SearchFilter.c"
 }
 
 
@@ -6757,7 +6766,7 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->label);
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6761 "SearchFilter.c"
+#line 6770 "SearchFilter.c"
 }
 
 
@@ -6823,14 +6832,14 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6827 "SearchFilter.c"
+#line 6836 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
 #line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action);
-#line 6834 "SearchFilter.c"
+#line 6843 "SearchFilter.c"
 }
 
 
@@ -6874,7 +6883,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
 #line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 6878 "SearchFilter.c"
+#line 6887 "SearchFilter.c"
 }
 
 
@@ -6891,7 +6900,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFil
 	_tmp1_ = label;
 #line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 6895 "SearchFilter.c"
+#line 6904 "SearchFilter.c"
 }
 
 
@@ -6902,14 +6911,14 @@ static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFi
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6906 "SearchFilter.c"
+#line 6915 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6913 "SearchFilter.c"
+#line 6922 "SearchFilter.c"
 }
 
 
@@ -6921,7 +6930,7 @@ static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* o
 	_g_object_unref0 (self->priv->button);
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6925 "SearchFilter.c"
+#line 6934 "SearchFilter.c"
 }
 
 
@@ -6940,42 +6949,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 6944 "SearchFilter.c"
+#line 6953 "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 6951 "SearchFilter.c"
+#line 6960 "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 6958 "SearchFilter.c"
+#line 6967 "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 6965 "SearchFilter.c"
+#line 6974 "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 6972 "SearchFilter.c"
+#line 6981 "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 6979 "SearchFilter.c"
+#line 6988 "SearchFilter.c"
 }
 
 
@@ -6984,7 +6993,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 6988 "SearchFilter.c"
+#line 6997 "SearchFilter.c"
 }
 
 
@@ -7078,14 +7087,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 7082 "SearchFilter.c"
+#line 7091 "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 7089 "SearchFilter.c"
+#line 7098 "SearchFilter.c"
 }
 
 
@@ -7097,7 +7106,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 7101 "SearchFilter.c"
+#line 7110 "SearchFilter.c"
 }
 
 
@@ -7118,19 +7127,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 7122 "SearchFilter.c"
+#line 7131 "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 7128 "SearchFilter.c"
+#line 7137 "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 7134 "SearchFilter.c"
+#line 7143 "SearchFilter.c"
 }
 
 
@@ -7192,7 +7201,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 7196 "SearchFilter.c"
+#line 7205 "SearchFilter.c"
 }
 
 
@@ -7223,7 +7232,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 7227 "SearchFilter.c"
+#line 7236 "SearchFilter.c"
 }
 
 
@@ -7235,7 +7244,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 7239 "SearchFilter.c"
+#line 7248 "SearchFilter.c"
 }
 
 
@@ -7247,7 +7256,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 7251 "SearchFilter.c"
+#line 7260 "SearchFilter.c"
 }
 
 
@@ -7261,23 +7270,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 7265 "SearchFilter.c"
+#line 7274 "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 7271 "SearchFilter.c"
+#line 7280 "SearchFilter.c"
 	} else {
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7275 "SearchFilter.c"
+#line 7284 "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 7281 "SearchFilter.c"
+#line 7290 "SearchFilter.c"
 }
 
 
@@ -7288,14 +7297,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 7292 "SearchFilter.c"
+#line 7301 "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 7299 "SearchFilter.c"
+#line 7308 "SearchFilter.c"
 }
 
 
@@ -7361,7 +7370,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 7365 "SearchFilter.c"
+#line 7374 "SearchFilter.c"
 }
 
 
@@ -7437,14 +7446,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 7441 "SearchFilter.c"
+#line 7450 "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 7448 "SearchFilter.c"
+#line 7457 "SearchFilter.c"
 }
 
 
@@ -7470,7 +7479,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 7474 "SearchFilter.c"
+#line 7483 "SearchFilter.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7481,11 +7490,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 7485 "SearchFilter.c"
+#line 7494 "SearchFilter.c"
 		}
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7489 "SearchFilter.c"
+#line 7498 "SearchFilter.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7496,12 +7505,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 7500 "SearchFilter.c"
+#line 7509 "SearchFilter.c"
 		}
 		default:
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7505 "SearchFilter.c"
+#line 7514 "SearchFilter.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7512,7 +7521,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 7516 "SearchFilter.c"
+#line 7525 "SearchFilter.c"
 		}
 	}
 #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7543,7 +7552,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 7547 "SearchFilter.c"
+#line 7556 "SearchFilter.c"
 }
 
 
@@ -7567,7 +7576,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 7571 "SearchFilter.c"
+#line 7580 "SearchFilter.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_ = 0;
@@ -7579,11 +7588,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 7583 "SearchFilter.c"
+#line 7592 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7587 "SearchFilter.c"
+#line 7596 "SearchFilter.c"
 		{
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -7595,11 +7604,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 7599 "SearchFilter.c"
+#line 7608 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7603 "SearchFilter.c"
+#line 7612 "SearchFilter.c"
 		{
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
@@ -7611,11 +7620,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 7615 "SearchFilter.c"
+#line 7624 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7619 "SearchFilter.c"
+#line 7628 "SearchFilter.c"
 		{
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -7627,13 +7636,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 7631 "SearchFilter.c"
+#line 7640 "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 7637 "SearchFilter.c"
+#line 7646 "SearchFilter.c"
 		{
 			gint _tmp9_ = 0;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7642,37 +7651,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 7646 "SearchFilter.c"
+#line 7655 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7650 "SearchFilter.c"
+#line 7659 "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 7656 "SearchFilter.c"
+#line 7665 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7660 "SearchFilter.c"
+#line 7669 "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 7666 "SearchFilter.c"
+#line 7675 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7670 "SearchFilter.c"
+#line 7679 "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 7676 "SearchFilter.c"
+#line 7685 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7680,7 +7689,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 7684 "SearchFilter.c"
+#line 7693 "SearchFilter.c"
 		}
 	}
 }
@@ -7706,7 +7715,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 7710 "SearchFilter.c"
+#line 7719 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -7718,11 +7727,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 7722 "SearchFilter.c"
+#line 7731 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7726 "SearchFilter.c"
+#line 7735 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -7734,11 +7743,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 7738 "SearchFilter.c"
+#line 7747 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7742 "SearchFilter.c"
+#line 7751 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -7750,11 +7759,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 7754 "SearchFilter.c"
+#line 7763 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7758 "SearchFilter.c"
+#line 7767 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -7766,13 +7775,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 7770 "SearchFilter.c"
+#line 7779 "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 7776 "SearchFilter.c"
+#line 7785 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -7784,7 +7793,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 7788 "SearchFilter.c"
+#line 7797 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7814,7 +7823,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 7818 "SearchFilter.c"
+#line 7827 "SearchFilter.c"
 		}
 	}
 #line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7837,7 +7846,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 7841 "SearchFilter.c"
+#line 7850 "SearchFilter.c"
 }
 
 
@@ -7855,7 +7864,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 7859 "SearchFilter.c"
+#line 7868 "SearchFilter.c"
 }
 
 
@@ -7872,7 +7881,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 7876 "SearchFilter.c"
+#line 7885 "SearchFilter.c"
 }
 
 
@@ -7881,7 +7890,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 7885 "SearchFilter.c"
+#line 7894 "SearchFilter.c"
 }
 
 
@@ -7897,7 +7906,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 7901 "SearchFilter.c"
+#line 7910 "SearchFilter.c"
 }
 
 
@@ -7916,7 +7925,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 7920 "SearchFilter.c"
+#line 7929 "SearchFilter.c"
 }
 
 
@@ -7976,14 +7985,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	_g_object_unref0 (image);
 #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7980 "SearchFilter.c"
+#line 7989 "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 7987 "SearchFilter.c"
+#line 7996 "SearchFilter.c"
 }
 
 
@@ -7992,7 +8001,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 7996 "SearchFilter.c"
+#line 8005 "SearchFilter.c"
 }
 
 
@@ -8007,7 +8016,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 8011 "SearchFilter.c"
+#line 8020 "SearchFilter.c"
 }
 
 
@@ -8024,7 +8033,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 8028 "SearchFilter.c"
+#line 8037 "SearchFilter.c"
 }
 
 
@@ -8041,7 +8050,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 8045 "SearchFilter.c"
+#line 8054 "SearchFilter.c"
 }
 
 
@@ -8052,14 +8061,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 8056 "SearchFilter.c"
+#line 8065 "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 8063 "SearchFilter.c"
+#line 8072 "SearchFilter.c"
 }
 
 
@@ -8081,7 +8090,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 8085 "SearchFilter.c"
+#line 8094 "SearchFilter.c"
 }
 
 
@@ -8100,35 +8109,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 8104 "SearchFilter.c"
+#line 8113 "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 8111 "SearchFilter.c"
+#line 8120 "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 8118 "SearchFilter.c"
+#line 8127 "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 8125 "SearchFilter.c"
+#line 8134 "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 8132 "SearchFilter.c"
+#line 8141 "SearchFilter.c"
 }
 
 
@@ -8139,13 +8148,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 8143 "SearchFilter.c"
+#line 8152 "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 8149 "SearchFilter.c"
+#line 8158 "SearchFilter.c"
 }
 
 
@@ -8156,13 +8165,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 8160 "SearchFilter.c"
+#line 8169 "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 8166 "SearchFilter.c"
+#line 8175 "SearchFilter.c"
 }
 
 
@@ -8228,7 +8237,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 8232 "SearchFilter.c"
+#line 8241 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_ = NULL;
@@ -8257,7 +8266,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		_search_it = _tmp11_;
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8261 "SearchFilter.c"
+#line 8270 "SearchFilter.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			SavedSearch* search = NULL;
@@ -8305,7 +8314,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			if (!_tmp13_) {
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8309 "SearchFilter.c"
+#line 8318 "SearchFilter.c"
 			}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
@@ -8421,11 +8430,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 8425 "SearchFilter.c"
+#line 8434 "SearchFilter.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8429 "SearchFilter.c"
+#line 8438 "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);
@@ -8463,14 +8472,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 8467 "SearchFilter.c"
+#line 8476 "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 8474 "SearchFilter.c"
+#line 8483 "SearchFilter.c"
 }
 
 
@@ -8490,7 +8499,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 8494 "SearchFilter.c"
+#line 8503 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8502,14 +8511,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 8506 "SearchFilter.c"
+#line 8515 "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 8513 "SearchFilter.c"
+#line 8522 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8518,7 +8527,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 8522 "SearchFilter.c"
+#line 8531 "SearchFilter.c"
 			}
 		}
 	}
@@ -8526,7 +8535,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 8530 "SearchFilter.c"
+#line 8539 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8538,14 +8547,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 8542 "SearchFilter.c"
+#line 8551 "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 8549 "SearchFilter.c"
+#line 8558 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8554,7 +8563,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 8558 "SearchFilter.c"
+#line 8567 "SearchFilter.c"
 			}
 		}
 	}
@@ -8582,7 +8591,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 8586 "SearchFilter.c"
+#line 8595 "SearchFilter.c"
 	}
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
@@ -8604,13 +8613,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 8608 "SearchFilter.c"
+#line 8617 "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 8614 "SearchFilter.c"
+#line 8623 "SearchFilter.c"
 }
 
 
@@ -8681,7 +8690,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 8685 "SearchFilter.c"
+#line 8694 "SearchFilter.c"
 }
 
 
@@ -8699,7 +8708,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 8703 "SearchFilter.c"
+#line 8712 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_ = NULL;
 		SavedSearch* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
@@ -8713,13 +8722,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 8717 "SearchFilter.c"
+#line 8726 "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 8723 "SearchFilter.c"
+#line 8732 "SearchFilter.c"
 }
 
 
@@ -8733,7 +8742,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 8737 "SearchFilter.c"
+#line 8746 "SearchFilter.c"
 }
 
 
@@ -8747,7 +8756,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 8751 "SearchFilter.c"
+#line 8760 "SearchFilter.c"
 }
 
 
@@ -8756,7 +8765,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 8760 "SearchFilter.c"
+#line 8769 "SearchFilter.c"
 }
 
 
@@ -8765,7 +8774,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 8769 "SearchFilter.c"
+#line 8778 "SearchFilter.c"
 }
 
 
@@ -8777,7 +8786,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 8781 "SearchFilter.c"
+#line 8790 "SearchFilter.c"
 }
 
 
@@ -8789,14 +8798,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 8793 "SearchFilter.c"
+#line 8802 "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 8800 "SearchFilter.c"
+#line 8809 "SearchFilter.c"
 }
 
 
@@ -8839,14 +8848,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 8843 "SearchFilter.c"
+#line 8852 "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 8850 "SearchFilter.c"
+#line 8859 "SearchFilter.c"
 }
 
 
@@ -8863,7 +8872,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 8867 "SearchFilter.c"
+#line 8876 "SearchFilter.c"
 }
 
 
@@ -8875,7 +8884,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 8879 "SearchFilter.c"
+#line 8888 "SearchFilter.c"
 }
 
 
@@ -8890,7 +8899,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 8894 "SearchFilter.c"
+#line 8903 "SearchFilter.c"
 }
 
 
@@ -8909,7 +8918,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 8913 "SearchFilter.c"
+#line 8922 "SearchFilter.c"
 }
 
 
@@ -8928,7 +8937,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 8932 "SearchFilter.c"
+#line 8941 "SearchFilter.c"
 }
 
 
@@ -8937,7 +8946,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 8941 "SearchFilter.c"
+#line 8950 "SearchFilter.c"
 }
 
 
@@ -8959,7 +8968,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 8963 "SearchFilter.c"
+#line 8972 "SearchFilter.c"
 }
 
 
@@ -8986,13 +8995,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 8990 "SearchFilter.c"
+#line 8999 "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 8996 "SearchFilter.c"
+#line 9005 "SearchFilter.c"
 	}
 }
 
@@ -9008,13 +9017,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 9012 "SearchFilter.c"
+#line 9021 "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 9018 "SearchFilter.c"
+#line 9027 "SearchFilter.c"
 	}
 }
 
@@ -9022,7 +9031,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 9026 "SearchFilter.c"
+#line 9035 "SearchFilter.c"
 }
 
 
@@ -9031,7 +9040,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 9035 "SearchFilter.c"
+#line 9044 "SearchFilter.c"
 	}
 }
 
@@ -9041,11 +9050,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 9045 "SearchFilter.c"
+#line 9054 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9049 "SearchFilter.c"
+#line 9058 "SearchFilter.c"
 	}
 }
 
@@ -9053,37 +9062,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 9057 "SearchFilter.c"
+#line 9066 "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 9064 "SearchFilter.c"
+#line 9073 "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 9071 "SearchFilter.c"
+#line 9080 "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 9075 "SearchFilter.c"
+#line 9084 "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 9079 "SearchFilter.c"
+#line 9088 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9083 "SearchFilter.c"
+#line 9092 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9087 "SearchFilter.c"
+#line 9096 "SearchFilter.c"
 }
 
 
@@ -9094,25 +9103,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 9098 "SearchFilter.c"
+#line 9107 "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 9104 "SearchFilter.c"
+#line 9113 "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 9108 "SearchFilter.c"
+#line 9117 "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 9112 "SearchFilter.c"
+#line 9121 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9116 "SearchFilter.c"
+#line 9125 "SearchFilter.c"
 }
 
 
@@ -9126,7 +9135,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 9130 "SearchFilter.c"
+#line 9139 "SearchFilter.c"
 }
 
 
@@ -9135,7 +9144,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 9139 "SearchFilter.c"
+#line 9148 "SearchFilter.c"
 }
 
 
@@ -9155,17 +9164,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 9159 "SearchFilter.c"
+#line 9168 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9163 "SearchFilter.c"
+#line 9172 "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 9169 "SearchFilter.c"
+#line 9178 "SearchFilter.c"
 	}
 }
 
@@ -9184,17 +9193,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 9188 "SearchFilter.c"
+#line 9197 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9192 "SearchFilter.c"
+#line 9201 "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 9198 "SearchFilter.c"
+#line 9207 "SearchFilter.c"
 	}
 }
 
@@ -9216,7 +9225,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 9220 "SearchFilter.c"
+#line 9229 "SearchFilter.c"
 }
 
 
@@ -9243,7 +9252,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 9247 "SearchFilter.c"
+#line 9256 "SearchFilter.c"
 }
 
 
@@ -9267,7 +9276,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 9271 "SearchFilter.c"
+#line 9280 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9279,14 +9288,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 9283 "SearchFilter.c"
+#line 9292 "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 9290 "SearchFilter.c"
+#line 9299 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -9298,7 +9307,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 9302 "SearchFilter.c"
+#line 9311 "SearchFilter.c"
 			}
 		}
 	}
@@ -9306,7 +9315,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 9310 "SearchFilter.c"
+#line 9319 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9318,14 +9327,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 9322 "SearchFilter.c"
+#line 9331 "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 9329 "SearchFilter.c"
+#line 9338 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 				guint _tmp7_ = 0U;
@@ -9337,7 +9346,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 9341 "SearchFilter.c"
+#line 9350 "SearchFilter.c"
 			}
 		}
 	}
@@ -9369,7 +9378,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 9373 "SearchFilter.c"
+#line 9382 "SearchFilter.c"
 }
 
 
@@ -9394,7 +9403,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 9398 "SearchFilter.c"
+#line 9407 "SearchFilter.c"
 }
 
 
@@ -9407,7 +9416,7 @@ void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9411 "SearchFilter.c"
+#line 9420 "SearchFilter.c"
 	}
 }
 
@@ -9419,7 +9428,7 @@ static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9423 "SearchFilter.c"
+#line 9432 "SearchFilter.c"
 }
 
 
@@ -9458,7 +9467,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 9462 "SearchFilter.c"
+#line 9471 "SearchFilter.c"
 }
 
 
@@ -9576,7 +9585,7 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9580 "SearchFilter.c"
+#line 9589 "SearchFilter.c"
 }
 
 
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 137318a..e4c1512 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -1059,7 +1059,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         
         try {
-            this.builder.add_from_resource ("/org/gnome/Shotwell/search_bar.ui");
+            this.builder.add_from_resource (Resources.get_ui("search_bar.ui"));
         } catch (Error err) {
             AppWindow.panic(_("Error loading search bar UI: %s").printf(
                 err.message));
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index ea177d1..84f1c80 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1108,7 +1108,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 1111 "SlideshowPage.c"
-					goto __catch460_g_error;
+					goto __catch461_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1122,8 +1122,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_object_unref0 (_tmp3_);
 #line 1124 "SlideshowPage.c"
 			}
-			goto __finally460;
-			__catch460_g_error:
+			goto __finally461;
+			__catch461_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1332,7 +1332,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				continue;
 #line 1334 "SlideshowPage.c"
 			}
-			__finally460:
+			__finally461:
 #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/Tag.c b/src/Tag.c
index cb70820..9545f23 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -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 __catch470_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 __finally470;
+	__catch470_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:
+	__finally470:
 #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 __catch471_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 __finally471;
+					__catch471_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:
+					__finally471:
 #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 __catch472_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 __finally472;
+	__catch472_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:
+	__finally472:
 #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 __catch473_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 __finally473;
+	__catch473_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:
+	__finally473:
 #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 __catch474_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 __finally474;
+	__catch474_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:
+	__finally474:
 #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 __catch475_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 __finally475;
+	__catch475_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:
+	__finally475:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -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 __catch476_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 __finally476;
+	__catch476_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:
+	__finally476:
 #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 __catch477_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 __finally477;
+	__catch477_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:
+	__finally477:
 #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/ThumbnailCache.c b/src/ThumbnailCache.c
index 4e8443f..c65d22e 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1805 "ThumbnailCache.c"
-			goto __catch235_g_error;
+			goto __catch236_g_error;
 		}
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = _tmp4_;
@@ -1816,8 +1816,8 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_object_unref0 (_tmp4_);
 #line 1818 "ThumbnailCache.c"
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally236;
+	__catch236_g_error:
 	{
 		GError* err = NULL;
 		GdkPixbuf* _tmp10_ = NULL;
@@ -1839,7 +1839,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_g_error_free0 (err);
 #line 1842 "ThumbnailCache.c"
-			goto __finally235;
+			goto __finally236;
 		}
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp13_ = _tmp10_;
@@ -1855,7 +1855,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_error_free0 (err);
 #line 1857 "ThumbnailCache.c"
 	}
-	__finally235:
+	__finally236:
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2390,11 +2390,11 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2393 "ThumbnailCache.c"
-				goto __catch236_g_error;
+				goto __catch237_g_error;
 			}
 		}
-		goto __finally236;
-		__catch236_g_error:
+		goto __finally237;
+		__catch237_g_error:
 		{
 			GError* err = NULL;
 			ThumbnailCacheAsyncFetchJob* _tmp14_ = NULL;
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			_g_error_free0 (err);
 #line 2420 "ThumbnailCache.c"
 		}
-		__finally236:
+		__finally237:
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2771,11 +2771,11 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2774 "ThumbnailCache.c"
-			goto __catch237_g_error;
+			goto __catch238_g_error;
 		}
 	}
-	goto __finally237;
-	__catch237_g_error:
+	goto __finally238;
+	__catch238_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 		_g_error_free0 (err);
 #line 2804 "ThumbnailCache.c"
 	}
-	__finally237:
+	__finally238:
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2946,11 +2946,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2949 "ThumbnailCache.c"
-			goto __catch238_g_error;
+			goto __catch239_g_error;
 		}
 	}
-	goto __finally238;
-	__catch238_g_error:
+	goto __finally239;
+	__catch239_g_error:
 	{
 		GError* err = NULL;
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2961,7 +2961,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 		_g_error_free0 (err);
 #line 2963 "ThumbnailCache.c"
 	}
-	__finally238:
+	__finally239:
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4079,7 +4079,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4081 "ThumbnailCache.c"
-				goto __catch239_g_error;
+				goto __catch240_g_error;
 			}
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp6_ = _tmp1_;
@@ -4148,8 +4148,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp8_);
 #line 4149 "ThumbnailCache.c"
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally240;
+	__catch240_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp17_ = NULL;
@@ -4168,11 +4168,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4170 "ThumbnailCache.c"
-					goto __catch240_g_error;
+					goto __catch241_g_error;
 				}
 			}
-			goto __finally240;
-			__catch240_g_error:
+			goto __finally241;
+			__catch241_g_error:
 			{
 				GError* generr = NULL;
 				GError* _tmp18_ = NULL;
@@ -4193,7 +4193,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				_g_error_free0 (generr);
 #line 4194 "ThumbnailCache.c"
 			}
-			__finally240:
+			__finally241:
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4225,7 +4225,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4226 "ThumbnailCache.c"
 	}
-	__finally239:
+	__finally240:
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
diff --git a/src/Tombstone.c b/src/Tombstone.c
index 34517c5..2107053 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -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 __catch547_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 __finally547;
+	__catch547_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:
+	__finally547:
 #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 __catch548_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 __finally548;
+				__catch548_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:
+				__finally548:
 #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 __catch549_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 __finally549;
+		__catch549_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:
+		__finally549:
 #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"
@@ -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 __catch550_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 __finally550;
+	__catch550_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:
+	__finally550:
 #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 __catch551_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 __finally551;
+	__catch551_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:
+	__finally551:
 #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 __catch552_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 __finally552;
+	__catch552_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:
+	__finally552:
 #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/Upgrades.c b/src/Upgrades.c
index 5a98673..1ebf302 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -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 __catch593_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 __finally593;
+	__catch593_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:
+	__finally593:
 #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 __catch594_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 __catch594_g_error;
 		}
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally594;
+	__catch594_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:
+	__finally594:
 #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 7228849..f406a1a 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -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 __catch575_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 __catch575_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 __catch575_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 __catch575_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 __finally575;
+	__catch575_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:
+	__finally575:
 #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 __catch576_g_error;
 		}
 	}
-	goto __finally574;
-	__catch574_g_error:
+	goto __finally576;
+	__catch576_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:
+	__finally576:
 #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 __catch577_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 __catch577_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 __catch577_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 __catch577_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 __catch577_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 __catch577_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 __catch577_g_error;
 			}
 		}
 	}
-	goto __finally575;
-	__catch575_g_error:
+	goto __finally577;
+	__catch577_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:
+	__finally577:
 #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 __catch578_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally578;
+	__catch578_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:
+	__finally578:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 152 "/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 __catch579_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 __catch579_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 __catch579_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 __finally579;
+	__catch579_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:
+	__finally579:
 #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 __catch580_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally580;
+	__catch580_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:
+	__finally580:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -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 __catch581_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 __catch581_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 __catch581_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 __finally581;
+	__catch581_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:
+	__finally581:
 #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 __catch582_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally582;
+	__catch582_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:
+	__finally582:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 76d8864..d201a2a 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -79,9 +79,9 @@ typedef struct _VideoReader VideoReader;
 typedef struct _VideoReaderClass VideoReaderClass;
 typedef struct _VideoReaderPrivate VideoReaderPrivate;
 #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_IMPORT_RESULT (import_result_get_type ())
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _video_reader_unref0(var) ((var == NULL) ? NULL : (var = (video_reader_unref (var), NULL)))
 
 #define TYPE_MEDIA_METADATA (media_metadata_get_type ())
@@ -1876,11 +1876,23 @@ VideoReader* video_reader_new (GFile* file) {
 
 gboolean video_reader_is_supported_video_file (GFile* file) {
 	gboolean result = FALSE;
+	gchar* mime_type = NULL;
 	GFile* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	guchar* _tmp3_ = NULL;
+	guchar* _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp8_ = NULL;
+	GFile* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	gchar* _tmp24_ = NULL;
+	gboolean _tmp25_ = FALSE;
+	gboolean _tmp26_ = FALSE;
+	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1890,16 +1902,164 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_reader_is_supported_video_filename (_tmp2_);
+	_tmp3_ = g_new0 (guchar, 0);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp2_);
+	_tmp4__length1 = 0;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp4_;
+	_tmp5_ = g_content_type_guess (_tmp2_, _tmp4_, (gsize) 0, NULL);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp6_ = _tmp5_;
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp4_ = (g_free (_tmp4_), NULL);
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp2_);
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	mime_type = _tmp6_;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp8_ = mime_type;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) {
+#line 1925 "VideoSupport.c"
+		GFile* _tmp9_ = NULL;
+		gboolean _tmp10_ = FALSE;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp9_ = file;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp10_ = g_file_has_uri_scheme (_tmp9_, "file");
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp7_ = _tmp10_;
+#line 1934 "VideoSupport.c"
+	} else {
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp7_ = FALSE;
+#line 1938 "VideoSupport.c"
+	}
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp7_) {
+#line 1942 "VideoSupport.c"
+		{
+			GFileInfo* info = NULL;
+			GFile* _tmp11_ = NULL;
+			GFileInfo* _tmp12_ = NULL;
+			gchar* content_type = NULL;
+			GFileInfo* _tmp13_ = NULL;
+			const gchar* _tmp14_ = NULL;
+			gchar* _tmp15_ = NULL;
+			gboolean _tmp16_ = FALSE;
+			const gchar* _tmp17_ = NULL;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp11_ = file;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			info = _tmp12_;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1961 "VideoSupport.c"
+				goto __catch493_g_error;
+			}
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp13_ = info;
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp14_ = g_file_info_get_content_type (_tmp13_);
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp15_ = g_strdup (_tmp14_);
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			content_type = _tmp15_;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp17_ = content_type;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp17_ != NULL) {
+#line 1976 "VideoSupport.c"
+				const gchar* _tmp18_ = NULL;
+				gboolean _tmp19_ = FALSE;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp18_ = content_type;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp19_ = g_str_has_prefix (_tmp18_, "video/");
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp16_ = _tmp19_;
+#line 1985 "VideoSupport.c"
+			} else {
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp16_ = FALSE;
+#line 1989 "VideoSupport.c"
+			}
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp16_) {
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				result = TRUE;
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_free0 (content_type);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_object_unref0 (info);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_free0 (mime_type);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				return result;
+#line 2003 "VideoSupport.c"
+			}
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_free0 (content_type);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_object_unref0 (info);
+#line 2009 "VideoSupport.c"
+		}
+		goto __finally493;
+		__catch493_g_error:
+		{
+			GError* _error_ = NULL;
+			GError* _tmp20_ = NULL;
+			const gchar* _tmp21_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_error_ = _inner_error_;
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_inner_error_ = NULL;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp20_ = _error_;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp21_ = _tmp20_->message;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp21_);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_error_free0 (_error_);
+#line 2029 "VideoSupport.c"
+		}
+		__finally493:
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_free0 (mime_type);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_clear_error (&_inner_error_);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			return FALSE;
+#line 2042 "VideoSupport.c"
+		}
+	}
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp22_ = file;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp23_ = g_file_get_basename (_tmp22_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp24_ = _tmp23_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp25_ = video_reader_is_supported_video_filename (_tmp24_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp26_ = _tmp25_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp24_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	result = _tmp26_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (mime_type);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 1903 "VideoSupport.c"
+#line 2063 "VideoSupport.c"
 }
 
 
@@ -1932,7 +2092,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1936 "VideoSupport.c"
+#line 2096 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1941,13 +2101,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1945 "VideoSupport.c"
+#line 2105 "VideoSupport.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1951 "VideoSupport.c"
+#line 2111 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1956,13 +2116,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1960 "VideoSupport.c"
+#line 2120 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1966 "VideoSupport.c"
+#line 2126 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1971,11 +2131,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1975 "VideoSupport.c"
+#line 2135 "VideoSupport.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1979 "VideoSupport.c"
+#line 2139 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1983,7 +2143,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1987 "VideoSupport.c"
+#line 2147 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1992,11 +2152,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1996 "VideoSupport.c"
+#line 2156 "VideoSupport.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2000 "VideoSupport.c"
+#line 2160 "VideoSupport.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2018,7 +2178,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2022 "VideoSupport.c"
+#line 2182 "VideoSupport.c"
 }
 
 
@@ -2034,167 +2194,175 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	const gchar* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (filename != NULL, FALSE);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = filename;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_new0 (guchar, 0);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2__length1 = 0;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_content_type_guess (_tmp0_, _tmp2_, (gsize) 0, NULL);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	mime_type = _tmp3_;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = (g_free (_tmp2_), NULL);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = mime_type;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = strlen (_tmp5_);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ >= 6) {
-#line 2064 "VideoSupport.c"
+#line 2224 "VideoSupport.c"
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = mime_type;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = string_slice (_tmp8_, (glong) 0, (glong) 6);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = g_strcmp0 (_tmp10_, "video/") == 0;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 2078 "VideoSupport.c"
+#line 2238 "VideoSupport.c"
 	} else {
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = FALSE;
-#line 2082 "VideoSupport.c"
+#line 2242 "VideoSupport.c"
 	}
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2086 "VideoSupport.c"
+#line 2246 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		extension = NULL;
-#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 79 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		name = NULL;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = filename;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		disassemble_filename (_tmp11_, &_tmp12_, &_tmp13_);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		name = _tmp12_;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		extension = _tmp13_;
-#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = extension;
-#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp14_ == NULL) {
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = TRUE;
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (name);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (extension);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2123 "VideoSupport.c"
+#line 2283 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection = VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) {
-#line 2136 "VideoSupport.c"
+#line 2296 "VideoSupport.c"
 				gchar* _tmp15_ = NULL;
 				gchar* s = NULL;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = g_strdup (s_collection[s_it]);
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				s = _tmp15_;
-#line 2143 "VideoSupport.c"
+#line 2303 "VideoSupport.c"
 				{
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
 					gint _tmp18_ = 0;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp16_ = s;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp17_ = extension;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp18_ = utf8_ci_compare (_tmp16_, _tmp17_);
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_tmp18_ == 0) {
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						result = FALSE;
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (s);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (name);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (extension);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (mime_type);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2168 "VideoSupport.c"
+#line 2328 "VideoSupport.c"
 					}
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2172 "VideoSupport.c"
+#line 2332 "VideoSupport.c"
 				}
 			}
 		}
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = TRUE;
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2186 "VideoSupport.c"
+#line 2346 "VideoSupport.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp19_ = filename;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp20_ = mime_type;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:92: Skipping %s, unsupported mime type %s", _tmp19_, _tmp20_);
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = FALSE;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2194 "VideoSupport.c"
+#line 2362 "VideoSupport.c"
 	}
-#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2198 "VideoSupport.c"
+#line 2366 "VideoSupport.c"
 }
 
 
@@ -2294,288 +2462,288 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	VideoImportParams* _tmp121_ = NULL;
 	Thumbnails* _tmp122_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 97 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = params;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_->file;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	file = _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2310 "VideoSupport.c"
+#line 2478 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFileInfo* _tmp5_ = NULL;
 		GFileInfo* _tmp6_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = file;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp5_;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2324 "VideoSupport.c"
-			goto __catch492_g_error;
+#line 2492 "VideoSupport.c"
+			goto __catch494_g_error;
 		}
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp6_;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2337 "VideoSupport.c"
+#line 2505 "VideoSupport.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2357 "VideoSupport.c"
+#line 2525 "VideoSupport.c"
 	}
-	__finally492:
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally494:
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2372 "VideoSupport.c"
+#line 2540 "VideoSupport.c"
 	}
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2388 "VideoSupport.c"
+#line 2556 "VideoSupport.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp10_) {
-#line 2396 "VideoSupport.c"
+#line 2564 "VideoSupport.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = file;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp13_);
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp13_);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2418 "VideoSupport.c"
+#line 2586 "VideoSupport.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp14_, &_tmp15_);
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	timestamp = _tmp15_;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = params;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_->md5;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp17_ != NULL, "params.md5 != null");
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = params;
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_->exposure_time_override;
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exposure_time = _tmp19_;
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = g_strdup ("");
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	title = _tmp20_;
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = g_strdup ("");
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	comment = _tmp21_;
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = file;
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = video_reader_new (_tmp22_);
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp23_;
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	is_interpretable = TRUE;
-#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = 0.0;
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = reader;
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2462 "VideoSupport.c"
+#line 2630 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
 		VideoReader* _tmp27_ = NULL;
 		gdouble _tmp28_ = 0.0;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = reader;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = video_reader_read_clip_duration (_tmp27_, &_inner_error_);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp28_;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2477 "VideoSupport.c"
-				goto __catch493_video_error;
+#line 2645 "VideoSupport.c"
+				goto __catch495_video_error;
 			}
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2498 "VideoSupport.c"
+#line 2666 "VideoSupport.c"
 		}
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2502 "VideoSupport.c"
+#line 2670 "VideoSupport.c"
 	}
-	goto __finally493;
-	__catch493_video_error:
+	goto __finally495;
+	__catch495_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = err;
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2535 "VideoSupport.c"
+#line 2703 "VideoSupport.c"
 		} else {
 			GError* _tmp30_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = err;
-#line 123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
-#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				is_interpretable = FALSE;
-#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2546 "VideoSupport.c"
+#line 2714 "VideoSupport.c"
 			} else {
-#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_error ("VideoSupport.vala:127: can't prepare video for import: an unknown kind" \
+#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_error ("VideoSupport.vala:143: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2550 "VideoSupport.c"
+#line 2718 "VideoSupport.c"
 			}
 		}
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2555 "VideoSupport.c"
+#line 2723 "VideoSupport.c"
 	}
-	__finally493:
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally495:
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2578 "VideoSupport.c"
+#line 2746 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
@@ -2594,437 +2762,437 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		gchar* _tmp44_ = NULL;
 		const gchar* _tmp45_ = NULL;
 		const gchar* _tmp48_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = reader;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = video_reader_read_metadata (_tmp31_, &_inner_error_);
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		metadata = _tmp32_;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2605 "VideoSupport.c"
-			goto __catch494_g_error;
+#line 2773 "VideoSupport.c"
+			goto __catch496_g_error;
 		}
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp34_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		creation_date_time = _tmp34_;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = creation_date_time;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2618 "VideoSupport.c"
+#line 2786 "VideoSupport.c"
 			MetadataDateTime* _tmp37_ = NULL;
 			time_t _tmp38_ = 0;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = creation_date_time;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2627 "VideoSupport.c"
+#line 2795 "VideoSupport.c"
 		} else {
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2631 "VideoSupport.c"
+#line 2799 "VideoSupport.c"
 		}
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp35_) {
-#line 2635 "VideoSupport.c"
+#line 2803 "VideoSupport.c"
 			MetadataDateTime* _tmp39_ = NULL;
 			time_t _tmp40_ = 0;
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp39_ = creation_date_time;
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2644 "VideoSupport.c"
+#line 2812 "VideoSupport.c"
 		}
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_title = _tmp42_;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp43_ = metadata;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp44_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_comment = _tmp44_;
-#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp45_ = video_title;
-#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp45_ != NULL) {
-#line 2662 "VideoSupport.c"
+#line 2830 "VideoSupport.c"
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp46_ = video_title;
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp47_ = g_strdup (_tmp46_);
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2673 "VideoSupport.c"
+#line 2841 "VideoSupport.c"
 		}
-#line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
-#line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp48_ != NULL) {
-#line 2679 "VideoSupport.c"
+#line 2847 "VideoSupport.c"
 			const gchar* _tmp49_ = NULL;
 			gchar* _tmp50_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp49_ = video_comment;
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp50_ = g_strdup (_tmp49_);
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2690 "VideoSupport.c"
+#line 2858 "VideoSupport.c"
 		}
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_title);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_metadata_date_time_unref0 (creation_date_time);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2700 "VideoSupport.c"
+#line 2868 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally496;
+	__catch496_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp51_ = err;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp52_ = _tmp51_->message;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:145: Unable to read video metadata: %s", _tmp52_);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:161: Unable to read video metadata: %s", _tmp52_);
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2720 "VideoSupport.c"
+#line 2888 "VideoSupport.c"
 	}
-	__finally494:
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally496:
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2743 "VideoSupport.c"
+#line 2911 "VideoSupport.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2749 "VideoSupport.c"
+#line 2917 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
 		VideoReader* _tmp55_ = NULL;
 		GDateTime* _tmp56_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp55_ = reader;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp56_ = _tmp55_->priv->_timestamp;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp56_ != NULL) {
-#line 2759 "VideoSupport.c"
+#line 2927 "VideoSupport.c"
 			VideoReader* _tmp57_ = NULL;
 			GDateTime* _tmp58_ = NULL;
 			gint64 _tmp59_ = 0LL;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp57_ = reader;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp58_ = _tmp57_->priv->_timestamp;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2771 "VideoSupport.c"
+#line 2939 "VideoSupport.c"
 		} else {
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2775 "VideoSupport.c"
+#line 2943 "VideoSupport.c"
 		}
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2779 "VideoSupport.c"
+#line 2947 "VideoSupport.c"
 	}
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = _tmp60_->row;
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = params;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = _tmp62_->row;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = file;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = g_file_get_path (_tmp64_);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp63_->filepath);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_->filepath = _tmp65_;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp66_ = params;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp67_ = _tmp66_->row;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp68_ = info;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp69_ = g_file_info_get_size (_tmp68_);
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp67_->filesize = _tmp69_;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp70_ = params;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp71_ = _tmp70_->row;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp72_ = timestamp;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp73_ = _tmp72_.tv_sec;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp71_->timestamp = (time_t) _tmp73_;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp74_ = params;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp75_ = _tmp74_->row;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp76_ = preview_frame;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp77_ = gdk_pixbuf_get_width (_tmp76_);
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp78_ = _tmp77_;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp75_->width = _tmp78_;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp79_ = params;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp80_ = _tmp79_->row;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp81_ = preview_frame;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp82_ = gdk_pixbuf_get_height (_tmp81_);
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp83_ = _tmp82_;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp80_->height = _tmp83_;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp84_ = params;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp85_ = _tmp84_->row;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp86_ = clip_duration;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp85_->clip_duration = _tmp86_;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp87_ = params;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp88_ = _tmp87_->row;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp89_ = is_interpretable;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp88_->is_interpretable = _tmp89_;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp90_ = params;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp91_ = _tmp90_->row;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp92_ = exposure_time;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp91_->exposure_time = _tmp92_;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp93_ = params;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp94_ = _tmp93_->row;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp95_ = params;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp96_ = _tmp95_->import_id;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp94_->import_id = _tmp96_;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp97_ = params;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp98_ = _tmp97_->row;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp99_ = params;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp100_ = _tmp99_->row;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp101_ = params;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp102_ = _tmp101_->md5;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp103_ = g_strdup (_tmp102_);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp100_->md5);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp100_->md5 = _tmp103_;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp104_ = params;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp105_ = _tmp104_->row;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp105_->time_created = (time_t) 0;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp106_ = params;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp107_ = _tmp106_->row;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp108_ = title;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp109_ = g_strdup (_tmp108_);
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp107_->title);
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp107_->title = _tmp109_;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp110_ = params;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp111_ = _tmp110_->row;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp112_ = comment;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp113_ = g_strdup (_tmp112_);
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp111_->comment);
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp111_->comment = _tmp113_;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp114_ = params;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp115_ = _tmp114_->row;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp116_ = g_strdup ("");
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp115_->backlinks);
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp115_->backlinks = _tmp116_;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp117_ = params;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp118_ = _tmp117_->row;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp118_->time_reimported = (time_t) 0;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp119_ = params;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_ = _tmp119_->row;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_->flags = (guint64) 0;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp121_ = params;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp122_ = _tmp121_->thumbnails;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp122_ != NULL) {
-#line 2955 "VideoSupport.c"
+#line 3123 "VideoSupport.c"
 		VideoImportParams* _tmp123_ = NULL;
 		Thumbnails* _tmp124_ = NULL;
 		VideoImportParams* _tmp125_ = NULL;
 		Thumbnails* _tmp126_ = NULL;
 		GdkPixbuf* _tmp127_ = NULL;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp123_ = params;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp124_ = thumbnails_new ();
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_thumbnails_unref0 (_tmp123_->thumbnails);
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp123_->thumbnails = _tmp124_;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp125_ = params;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp126_ = _tmp125_->thumbnails;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp127_ = preview_frame;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 2977 "VideoSupport.c"
+#line 3145 "VideoSupport.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (comment);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (title);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (info);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (file);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2995 "VideoSupport.c"
+#line 3163 "VideoSupport.c"
 }
 
 
 static GDate* _g_date_dup (GDate* self) {
 	GDate* dup;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (GDate, 1);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (GDate));
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3007 "VideoSupport.c"
+#line 3175 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3014 "VideoSupport.c"
+#line 3182 "VideoSupport.c"
 }
 
 
 static void video_reader_read_internal (VideoReader* self, GError** error) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_READER (self));
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_reader_does_file_exist (self);
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp0_) {
-#line 3027 "VideoSupport.c"
+#line 3195 "VideoSupport.c"
 		GFile* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -3032,41 +3200,41 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->file;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = g_file_get_path (_tmp1_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp3_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp5_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp3_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp7_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3061 "VideoSupport.c"
+#line 3229 "VideoSupport.c"
 		} else {
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3069 "VideoSupport.c"
+#line 3237 "VideoSupport.c"
 		}
 	}
 	{
@@ -3085,90 +3253,90 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gboolean _tmp17_ = FALSE;
 		GstDiscovererInfo* _tmp18_ = NULL;
 		GstTagList* _tmp19_ = NULL;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		d = _tmp8_;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3094 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 3262 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = self->priv->file;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gst_discoverer_discover_uri (_tmp9_, _tmp12_, &_inner_error_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp12_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp14_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3117 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 3285 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = gst_discoverer_info_get_duration (_tmp15_);
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->clip_duration = ((gdouble) _tmp16_) / 1000000000.0;
-#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_date = NULL;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = info;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3134 "VideoSupport.c"
+#line 3302 "VideoSupport.c"
 			GstDiscovererInfo* _tmp20_ = NULL;
 			GstTagList* _tmp21_ = NULL;
 			GDate _tmp22_ = {0};
 			gboolean _tmp23_ = FALSE;
 			GDate _tmp24_ = {0};
 			GDate* _tmp25_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = gst_discoverer_info_get_tags (_tmp20_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = gst_tag_list_get_date (_tmp21_, GST_TAG_DATE, &_tmp22_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (video_date);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = _tmp22_;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = __g_date_dup0 (&_tmp24_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_date = _tmp25_;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3157 "VideoSupport.c"
+#line 3325 "VideoSupport.c"
 		} else {
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3161 "VideoSupport.c"
+#line 3329 "VideoSupport.c"
 		}
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3165 "VideoSupport.c"
+#line 3333 "VideoSupport.c"
 			GDate* _tmp26_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
-#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp26_ != NULL) {
-#line 3171 "VideoSupport.c"
+#line 3339 "VideoSupport.c"
 				GDate* _tmp27_ = NULL;
 				GDateYear _tmp28_ = 0U;
 				GDate* _tmp29_ = NULL;
@@ -3177,39 +3345,39 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 				GDateDay _tmp32_ = '\0';
 				GDateTime* _tmp33_ = NULL;
 				GDateTime* _tmp34_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp27_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp28_ = g_date_get_year (_tmp27_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp29_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp30_ = g_date_get_month (_tmp29_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp31_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = g_date_get_day (_tmp31_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp33_ = g_date_time_new_local ((gint) _tmp28_, (gint) _tmp30_, (gint) _tmp32_, 0, 0, (gdouble) 0);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = _tmp33_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_reader_set_timestamp (self, _tmp34_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3200 "VideoSupport.c"
+#line 3368 "VideoSupport.c"
 			}
 		}
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_date);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3209 "VideoSupport.c"
+#line 3377 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3220,55 +3388,55 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gchar* _tmp40_ = NULL;
 		GError* _tmp41_ = NULL;
 		GError* _tmp42_ = NULL;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp35_ = e;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = _tmp35_->message;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:207: Video read error: %s", _tmp36_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:223: Video read error: %s", _tmp36_);
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp37_ = e;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp38_ = _tmp37_->message;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp39_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp38_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp40_ = _tmp39_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp40_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = _tmp41_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp40_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp42_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3251 "VideoSupport.c"
-		goto __finally495;
+#line 3419 "VideoSupport.c"
+		goto __finally497;
 	}
-	__finally495:
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally497:
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3263 "VideoSupport.c"
+#line 3431 "VideoSupport.c"
 		} else {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3271 "VideoSupport.c"
+#line 3439 "VideoSupport.c"
 		}
 	}
 }
@@ -3277,41 +3445,41 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	gboolean result = FALSE;
 	GPid _tmp0_ = 0;
-#line 214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:215: Thumbnailer timer called");
-#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:231: Thumbnailer timer called");
+#line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->thumbnailer_pid;
-#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3288 "VideoSupport.c"
+#line 3456 "VideoSupport.c"
 		GPid _tmp1_ = 0;
 		GPid _tmp2_ = 0;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->thumbnailer_pid;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:217: Killing thumbnailer process: %d", (gint) _tmp1_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:233: Killing thumbnailer process: %d", (gint) _tmp1_);
+#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->thumbnailer_pid;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3299 "VideoSupport.c"
+#line 3467 "VideoSupport.c"
 	}
-#line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3305 "VideoSupport.c"
+#line 3473 "VideoSupport.c"
 }
 
 
 static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self) {
 	gboolean result;
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3314 "VideoSupport.c"
+#line 3482 "VideoSupport.c"
 }
 
 
@@ -3342,137 +3510,137 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	gint _tmp30_ = 0;
 	GPid _tmp36_ = 0;
 	GError * _inner_error_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_file != NULL, NULL);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = app_dirs_get_thumbnailer_bin ();
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:227: Launching thumbnailer process: %s", _tmp3_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:243: Launching thumbnailer process: %s", _tmp3_);
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = app_dirs_get_thumbnailer_bin ();
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_file;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = g_new0 (gchar*, 2 + 1);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[0] = _tmp6_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[1] = _tmp8_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = _tmp9_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10__length1 = 2;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = _tmp10_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv_length1 = _tmp10__length1;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3391 "VideoSupport.c"
+#line 3559 "VideoSupport.c"
 	{
 		gchar** _tmp11_ = NULL;
 		gint _tmp11__length1 = 0;
 		GPid _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		GPid _tmp14_ = 0;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = argv;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11__length1 = argv_length1;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_spawn_async_with_pipes (NULL, _tmp11_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp12_, NULL, &_tmp13_, NULL, &_inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->thumbnailer_pid = _tmp12_;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		child_stdout = _tmp13_;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3410 "VideoSupport.c"
-			goto __catch496_g_error;
+#line 3578 "VideoSupport.c"
+			goto __catch498_g_error;
 		}
-#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
-#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3417 "VideoSupport.c"
+#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:250: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
+#line 3585 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_g_error:
+	goto __finally498;
+	__catch498_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		GPid _tmp17_ = 0;
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = e;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = _tmp15_->message;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:236: Error spawning process: %s", _tmp16_);
-#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:252: Error spawning process: %s", _tmp16_);
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp17_ = self->priv->thumbnailer_pid;
-#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_ != ((GPid) 0)) {
-#line 3440 "VideoSupport.c"
+#line 3608 "VideoSupport.c"
 			GPid _tmp18_ = 0;
-#line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
-#line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3446 "VideoSupport.c"
+#line 3614 "VideoSupport.c"
 		}
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3456 "VideoSupport.c"
+#line 3624 "VideoSupport.c"
 	}
-	__finally496:
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally498:
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3469 "VideoSupport.c"
+#line 3637 "VideoSupport.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3475 "VideoSupport.c"
+#line 3643 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
 		gint _tmp19_ = 0;
@@ -3481,141 +3649,141 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		GUnixInputStream* _tmp22_ = NULL;
 		GdkPixbuf* _tmp23_ = NULL;
 		GdkPixbuf* _tmp24_ = NULL;
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = child_stdout;
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp19_, TRUE);
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		unix_input = _tmp20_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3500 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 3668 "VideoSupport.c"
+			goto __catch499_g_error;
 		}
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = NULL;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = _tmp24_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp21_);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3515 "VideoSupport.c"
+#line 3683 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally499;
+	__catch499_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = e;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_->message;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:251: Error creating pixbuf: %s", _tmp26_);
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:267: Error creating pixbuf: %s", _tmp26_);
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3539 "VideoSupport.c"
+#line 3707 "VideoSupport.c"
 	}
-	__finally497:
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally499:
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3554 "VideoSupport.c"
+#line 3722 "VideoSupport.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = self->priv->thumbnailer_pid;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = waitpid ((pid_t) _tmp27_, &_tmp28_, 0);
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret_waitpid = (gint) _tmp29_;
-#line 258 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = ret_waitpid;
-#line 258 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp30_ < 0) {
-#line 3570 "VideoSupport.c"
+#line 3738 "VideoSupport.c"
 		gint _tmp31_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:259: waitpid returned error code: %d", _tmp31_);
-#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:275: waitpid returned error code: %d", _tmp31_);
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3580 "VideoSupport.c"
+#line 3748 "VideoSupport.c"
 	} else {
 		gint _tmp32_ = 0;
 		gint _tmp33_ = 0;
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = child_status;
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = WEXITSTATUS (_tmp32_);
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (0 != _tmp33_) {
-#line 3590 "VideoSupport.c"
+#line 3758 "VideoSupport.c"
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = child_status;
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = WEXITSTATUS (_tmp34_);
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_debug ("VideoSupport.vala:262: Thumbnailer exited with error code: %d", _tmp35_);
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_debug ("VideoSupport.vala:278: Thumbnailer exited with error code: %d", _tmp35_);
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (buf);
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3603 "VideoSupport.c"
+#line 3771 "VideoSupport.c"
 		}
 	}
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp36_ = self->priv->thumbnailer_pid;
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_spawn_close_pid (_tmp36_);
-#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->thumbnailer_pid = (GPid) 0;
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = buf;
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3618 "VideoSupport.c"
+#line 3786 "VideoSupport.c"
 }
 
 
@@ -3626,25 +3794,25 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 	gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->file;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3647 "VideoSupport.c"
+#line 3815 "VideoSupport.c"
 }
 
 
@@ -3659,72 +3827,72 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	GdkPixbuf* _tmp8_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->preview_frame;
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3668 "VideoSupport.c"
+#line 3836 "VideoSupport.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->preview_frame;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3679 "VideoSupport.c"
+#line 3847 "VideoSupport.c"
 	}
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp3_) {
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3689 "VideoSupport.c"
+#line 3857 "VideoSupport.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = g_file_get_path (_tmp4_);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_reader_thumbnailer (self, _tmp6_);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->preview_frame);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->preview_frame = _tmp7_;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp6_);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = self->priv->preview_frame;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (NULL == _tmp8_) {
-#line 3709 "VideoSupport.c"
+#line 3877 "VideoSupport.c"
 		GdkPixbuf* _tmp9_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (self->priv->preview_frame);
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3717 "VideoSupport.c"
+#line 3885 "VideoSupport.c"
 	}
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp11_;
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3727 "VideoSupport.c"
+#line 3895 "VideoSupport.c"
 }
 
 
@@ -3733,41 +3901,41 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->clip_duration;
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == VIDEO_READER_UNKNOWN_CLIP_DURATION) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_read_internal (self, &_inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3752 "VideoSupport.c"
+#line 3920 "VideoSupport.c"
 			} else {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3760 "VideoSupport.c"
+#line 3928 "VideoSupport.c"
 			}
 		}
 	}
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->clip_duration;
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3770 "VideoSupport.c"
+#line 3938 "VideoSupport.c"
 }
 
 
@@ -3781,43 +3949,43 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 	GFile* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_metadata_new ();
-#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	metadata = _tmp0_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->file;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = g_file_new_for_path (_tmp3_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp5_, &_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3814 "VideoSupport.c"
+#line 3982 "VideoSupport.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3820 "VideoSupport.c"
+#line 3988 "VideoSupport.c"
 }
 
 
@@ -3832,14 +4000,14 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3835 "VideoSupport.c"
+#line 4003 "VideoSupport.c"
 }
 
 
 static gpointer _g_date_time_ref0 (gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 3842 "VideoSupport.c"
+#line 4010 "VideoSupport.c"
 }
 
 
@@ -3856,14 +4024,14 @@ static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
 	_g_date_time_unref0 (self->priv->_timestamp);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_timestamp = _tmp1_;
-#line 3859 "VideoSupport.c"
+#line 4027 "VideoSupport.c"
 }
 
 
 static void value_video_reader_init (GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3866 "VideoSupport.c"
+#line 4034 "VideoSupport.c"
 }
 
 
@@ -3872,7 +4040,7 @@ static void value_video_reader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (value->data[0].v_pointer);
-#line 3875 "VideoSupport.c"
+#line 4043 "VideoSupport.c"
 	}
 }
 
@@ -3882,11 +4050,11 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer);
-#line 3885 "VideoSupport.c"
+#line 4053 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3889 "VideoSupport.c"
+#line 4057 "VideoSupport.c"
 	}
 }
 
@@ -3894,37 +4062,37 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_video_reader_peek_pointer (const GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3897 "VideoSupport.c"
+#line 4065 "VideoSupport.c"
 }
 
 
 static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3904 "VideoSupport.c"
+#line 4072 "VideoSupport.c"
 		VideoReader* object;
 		object = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3911 "VideoSupport.c"
+#line 4079 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3915 "VideoSupport.c"
+#line 4083 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 3919 "VideoSupport.c"
+#line 4087 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3923 "VideoSupport.c"
+#line 4091 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3927 "VideoSupport.c"
+#line 4095 "VideoSupport.c"
 }
 
 
@@ -3935,25 +4103,25 @@ static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3938 "VideoSupport.c"
+#line 4106 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 3944 "VideoSupport.c"
+#line 4112 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3948 "VideoSupport.c"
+#line 4116 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 3952 "VideoSupport.c"
+#line 4120 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3956 "VideoSupport.c"
+#line 4124 "VideoSupport.c"
 }
 
 
@@ -3967,7 +4135,7 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3970 "VideoSupport.c"
+#line 4138 "VideoSupport.c"
 }
 
 
@@ -3976,7 +4144,7 @@ gpointer value_get_video_reader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3979 "VideoSupport.c"
+#line 4147 "VideoSupport.c"
 }
 
 
@@ -3996,17 +4164,17 @@ void value_set_video_reader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_ref (value->data[0].v_pointer);
-#line 3999 "VideoSupport.c"
+#line 4167 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4003 "VideoSupport.c"
+#line 4171 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4009 "VideoSupport.c"
+#line 4177 "VideoSupport.c"
 	}
 }
 
@@ -4025,17 +4193,17 @@ void value_take_video_reader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4028 "VideoSupport.c"
+#line 4196 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4032 "VideoSupport.c"
+#line 4200 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4038 "VideoSupport.c"
+#line 4206 "VideoSupport.c"
 	}
 }
 
@@ -4047,7 +4215,7 @@ static void video_reader_class_init (VideoReaderClass * klass) {
 	((VideoReaderClass *) klass)->finalize = video_reader_finalize;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoReaderPrivate));
-#line 4050 "VideoSupport.c"
+#line 4218 "VideoSupport.c"
 }
 
 
@@ -4066,7 +4234,7 @@ static void video_reader_instance_init (VideoReader * self) {
 	self->priv->_timestamp = NULL;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 4069 "VideoSupport.c"
+#line 4237 "VideoSupport.c"
 }
 
 
@@ -4082,7 +4250,7 @@ static void video_reader_finalize (VideoReader* obj) {
 	_g_object_unref0 (self->priv->file);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
-#line 4085 "VideoSupport.c"
+#line 4253 "VideoSupport.c"
 }
 
 
@@ -4107,7 +4275,7 @@ gpointer video_reader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4110 "VideoSupport.c"
+#line 4278 "VideoSupport.c"
 }
 
 
@@ -4120,15 +4288,15 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4123 "VideoSupport.c"
+#line 4291 "VideoSupport.c"
 	}
 }
 
 
 static gpointer _video_row_ref0 (gpointer self) {
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4131 "VideoSupport.c"
+#line 4299 "VideoSupport.c"
 }
 
 
@@ -4143,76 +4311,76 @@ Video* video_construct (GType object_type, VideoRow* row) {
 	gboolean _tmp6_ = FALSE;
 	VideoRow* _tmp7_ = NULL;
 	guint64 _tmp8_ = 0ULL;
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_ROW (row), NULL);
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (Video*) video_source_construct (object_type);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = row;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _video_row_ref0 (_tmp0_);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->backing_row = _tmp1_;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->backing_row;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->priv->backing_row;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_->title;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_prep_title (_tmp4_);
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_->title);
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_->title = _tmp5_;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = row;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4178 "VideoSupport.c"
+#line 4346 "VideoSupport.c"
 	} else {
 		VideoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = row;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4188 "VideoSupport.c"
+#line 4356 "VideoSupport.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp6_) {
-#line 4192 "VideoSupport.c"
+#line 4360 "VideoSupport.c"
 		VideoSourceCollection* _tmp11_ = NULL;
 		VideoRow* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_global;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = row;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_->backlinks;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_);
-#line 4204 "VideoSupport.c"
+#line 4372 "VideoSupport.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4208 "VideoSupport.c"
+#line 4376 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4215 "VideoSupport.c"
+#line 4383 "VideoSupport.c"
 }
 
 
@@ -4262,168 +4430,168 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp63_ = NULL;
 	GeeCollection* _tmp64_ = NULL;
 	GeeCollection* _tmp65_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
-#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = -1;
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = FALSE;
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 382 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args = NULL;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args_length1 = 0;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_args_size_ = args_length1;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	gst_init (&args_length1, &args);
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gst_registry_get ();
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	registry = _tmp1_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp3_);
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	saved_state = _tmp5_;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = registry;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = (gint) _tmp7_;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = saved_state;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
-#line 377 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:377: interpreter state cookie not found; assuming al" \
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:393: interpreter state cookie not found; assuming al" \
 "l video thumbnails are out of date");
-#line 378 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4313 "VideoSupport.c"
+#line 4481 "VideoSupport.c"
 	} else {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = saved_state;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video_current_state;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp9_ != _tmp10_) {
-#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:380: interpreter state has changed; video thumbnails" \
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:396: interpreter state has changed; video thumbnails" \
 " may be out of date");
-#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4327 "VideoSupport.c"
+#line 4495 "VideoSupport.c"
 		}
 	}
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = registry;
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp12_;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = feature;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 4340 "VideoSupport.c"
+#line 4508 "VideoSupport.c"
 		GstRegistry* _tmp14_ = NULL;
 		GstPluginFeature* _tmp15_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = registry;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = feature;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4349 "VideoSupport.c"
+#line 4517 "VideoSupport.c"
 	}
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = registry;
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp17_;
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = feature;
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp18_ != NULL) {
-#line 4363 "VideoSupport.c"
+#line 4531 "VideoSupport.c"
 		GstRegistry* _tmp19_ = NULL;
 		GstPluginFeature* _tmp20_ = NULL;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = registry;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = feature;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4372 "VideoSupport.c"
+#line 4540 "VideoSupport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = video_source_collection_new ();
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_data_collection_unref0 (video_global);
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_global = _tmp21_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = video_table_get_instance ();
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = video_table_get_all (_tmp23_);
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = _tmp24_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp23_);
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all = _tmp25_;
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all_videos = _tmp26_;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	trashed_videos = _tmp27_;
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	offline_videos = _tmp28_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = all;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	count = _tmp31_;
-#line 4412 "VideoSupport.c"
+#line 4580 "VideoSupport.c"
 	{
 		gint ctr = 0;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4417 "VideoSupport.c"
+#line 4585 "VideoSupport.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = TRUE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4424 "VideoSupport.c"
+#line 4592 "VideoSupport.c"
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				Video* video = NULL;
@@ -4438,180 +4606,180 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				gboolean _tmp45_ = FALSE;
 				ProgressMonitor _tmp54_ = NULL;
 				void* _tmp54__target = NULL;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp32_) {
-#line 4441 "VideoSupport.c"
+#line 4609 "VideoSupport.c"
 					gint _tmp33_ = 0;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp33_ = ctr;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					ctr = _tmp33_ + 1;
-#line 4447 "VideoSupport.c"
+#line 4615 "VideoSupport.c"
 				}
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = ctr;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp35_ = count;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!(_tmp34_ < _tmp35_)) {
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4459 "VideoSupport.c"
+#line 4627 "VideoSupport.c"
 				}
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp36_ = all;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp37_ = ctr;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp39_ = (VideoRow*) _tmp38_;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp40_ = video_new (_tmp39_);
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_video_row_unref0 (_tmp39_);
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp41_;
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp42_ = video_interpreter_state_changed;
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp42_) {
-#line 4481 "VideoSupport.c"
+#line 4649 "VideoSupport.c"
 					Video* _tmp43_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp43_ = video;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4487 "VideoSupport.c"
+#line 4655 "VideoSupport.c"
 				}
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp44_ = video;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp45_) {
-#line 4495 "VideoSupport.c"
+#line 4663 "VideoSupport.c"
 					GeeArrayList* _tmp46_ = NULL;
 					Video* _tmp47_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp46_ = trashed_videos;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp47_ = video;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4504 "VideoSupport.c"
+#line 4672 "VideoSupport.c"
 				} else {
 					Video* _tmp48_ = NULL;
 					gboolean _tmp49_ = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp48_ = video;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_tmp49_) {
-#line 4514 "VideoSupport.c"
+#line 4682 "VideoSupport.c"
 						GeeArrayList* _tmp50_ = NULL;
 						Video* _tmp51_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp50_ = offline_videos;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp51_ = video;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4523 "VideoSupport.c"
+#line 4691 "VideoSupport.c"
 					} else {
 						GeeArrayList* _tmp52_ = NULL;
 						Video* _tmp53_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp52_ = all_videos;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp53_ = video;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4533 "VideoSupport.c"
+#line 4701 "VideoSupport.c"
 					}
 				}
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54_ = monitor;
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54__target = monitor_target;
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp54_ != NULL) {
-#line 4542 "VideoSupport.c"
+#line 4710 "VideoSupport.c"
 					ProgressMonitor _tmp55_ = NULL;
 					void* _tmp55__target = NULL;
 					gint _tmp56_ = 0;
 					gint _tmp57_ = 0;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ = monitor;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55__target = monitor_target;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp56_ = ctr;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp57_ = count;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4557 "VideoSupport.c"
+#line 4725 "VideoSupport.c"
 				}
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4561 "VideoSupport.c"
+#line 4729 "VideoSupport.c"
 			}
 		}
 	}
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp58_ = video_global;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp59_ = trashed_videos;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = video_global;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = offline_videos;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = video_global;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = all_videos;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = _tmp64_;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp65_);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (trashed_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4599 "VideoSupport.c"
+#line 4767 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4612 "VideoSupport.c"
+#line 4780 "VideoSupport.c"
 }
 
 
@@ -4619,39 +4787,39 @@ void video_notify_normal_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4626 "VideoSupport.c"
+#line 4794 "VideoSupport.c"
 	}
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:439: normal video thumbnail regeneration completed");
-#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:455: normal video thumbnail regeneration completed");
+#line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = TRUE;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4636 "VideoSupport.c"
+#line 4804 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4642 "VideoSupport.c"
+#line 4810 "VideoSupport.c"
 	} else {
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4646 "VideoSupport.c"
+#line 4814 "VideoSupport.c"
 	}
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4652 "VideoSupport.c"
+#line 4820 "VideoSupport.c"
 	}
 }
 
@@ -4660,69 +4828,69 @@ void video_notify_offline_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4667 "VideoSupport.c"
+#line 4835 "VideoSupport.c"
 	}
-#line 450 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:450: offline video thumbnail regeneration completed");
-#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:466: offline video thumbnail regeneration completed");
+#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = TRUE;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4677 "VideoSupport.c"
+#line 4845 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4683 "VideoSupport.c"
+#line 4851 "VideoSupport.c"
 	} else {
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4687 "VideoSupport.c"
+#line 4855 "VideoSupport.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4693 "VideoSupport.c"
+#line 4861 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
 	gboolean _tmp0_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4704 "VideoSupport.c"
+#line 4872 "VideoSupport.c"
 		ConfigFacade* _tmp1_ = NULL;
 		ConfigFacade* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:459: saving video interpreter state to configuration" \
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:475: saving video interpreter state to configuration" \
 " system");
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		configuration_facade_set_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4722 "VideoSupport.c"
+#line 4890 "VideoSupport.c"
 	}
 }
 
@@ -4757,27 +4925,27 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	ExporterCompletionCallback _tmp51_ = NULL;
 	void* _tmp51__target = NULL;
 	GError * _inner_error_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ == 0) {
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4771 "VideoSupport.c"
+#line 4939 "VideoSupport.c"
 	}
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4777 "VideoSupport.c"
+#line 4945 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		Scaling _tmp5_ = {0};
@@ -4789,47 +4957,47 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		ExporterUI* _tmp11_ = NULL;
 		ExporterCompletionCallback _tmp12_ = NULL;
 		void* _tmp12__target = NULL;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4819 "VideoSupport.c"
+#line 4987 "VideoSupport.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4829 "VideoSupport.c"
+#line 4997 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_ = NULL;
@@ -4838,22 +5006,22 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp27_ = NULL;
 		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4840 "VideoSupport.c"
+#line 5008 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
 			GeeIterator* _tmp17_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4853 "VideoSupport.c"
+#line 5021 "VideoSupport.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				Video* v = NULL;
@@ -4861,67 +5029,67 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				gpointer _tmp21_ = NULL;
 				Video* _tmp22_ = NULL;
 				Video* _tmp23_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4869 "VideoSupport.c"
+#line 5037 "VideoSupport.c"
 				}
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				v = (Video*) _tmp21_;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp23_;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4889 "VideoSupport.c"
+#line 5057 "VideoSupport.c"
 			}
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 4893 "VideoSupport.c"
+#line 5061 "VideoSupport.c"
 		}
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		save_as = _tmp28_;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp29_ == NULL) {
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 4921 "VideoSupport.c"
+#line 5089 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_ = NULL;
@@ -4930,270 +5098,270 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			GFile* _tmp33_ = NULL;
 			AppWindow* _tmp34_ = NULL;
 			AppWindow* _tmp35_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp31_);
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4946 "VideoSupport.c"
-				goto __catch498_g_error;
+#line 5114 "VideoSupport.c"
+				goto __catch500_g_error;
 			}
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 4957 "VideoSupport.c"
+#line 5125 "VideoSupport.c"
 		}
-		goto __finally498;
-		__catch498_g_error:
+		goto __finally500;
+		__catch500_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
 			AppWindow* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp37_);
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 4984 "VideoSupport.c"
+#line 5152 "VideoSupport.c"
 		}
-		__finally498:
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally500:
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 4999 "VideoSupport.c"
+#line 5167 "VideoSupport.c"
 		}
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5009 "VideoSupport.c"
+#line 5177 "VideoSupport.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = _ ("Export Videos");
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp40_ = export_ui_choose_dir (_tmp39_);
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_dir = _tmp40_;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp41_ = export_dir;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp41_ == NULL) {
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5027 "VideoSupport.c"
+#line 5195 "VideoSupport.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = videos;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp43_ = export_dir;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	scaling_for_original (&_tmp44_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_format_parameters_unmodified (&_tmp45_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp46_ = exporter_new (_tmp42_, _tmp43_, &_tmp44_, &_tmp45_, FALSE);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp47_ = _tmp46_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp48_ = exporter_ui_new (_tmp47_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp49_ = _tmp48_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp47_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter = _tmp49_;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50_ = exporter;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51_ = done;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51__target = done_target;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter_ui_export (_tmp50_, _tmp51_, _tmp51__target);
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5063 "VideoSupport.c"
+#line 5231 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5074 "VideoSupport.c"
+#line 5242 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		VideoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5096 "VideoSupport.c"
-				goto __catch499_database_error;
+#line 5264 "VideoSupport.c"
+				goto __catch501_database_error;
 			}
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5105 "VideoSupport.c"
+#line 5273 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5113 "VideoSupport.c"
+#line 5281 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5128 "VideoSupport.c"
+#line 5296 "VideoSupport.c"
 			}
-			__finally500:
+			__finally502:
 			{
 				VideoRow* _tmp8_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5137 "VideoSupport.c"
+#line 5305 "VideoSupport.c"
 			}
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5143 "VideoSupport.c"
-					goto __catch499_database_error;
+#line 5311 "VideoSupport.c"
+					goto __catch501_database_error;
 				}
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5152 "VideoSupport.c"
+#line 5320 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally499;
-	__catch499_database_error:
+	goto __finally501;
+	__catch501_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:525: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:541: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5182 "VideoSupport.c"
+#line 5350 "VideoSupport.c"
 	}
-	__finally499:
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally501:
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5193 "VideoSupport.c"
+#line 5361 "VideoSupport.c"
 	}
 }
 
@@ -5202,18 +5370,18 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5206 "VideoSupport.c"
+#line 5374 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5213 "VideoSupport.c"
+#line 5381 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_ = NULL;
@@ -5224,70 +5392,70 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5246 "VideoSupport.c"
+#line 5414 "VideoSupport.c"
 				VideoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5255 "VideoSupport.c"
+#line 5423 "VideoSupport.c"
 			}
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5259 "VideoSupport.c"
+#line 5427 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5266 "VideoSupport.c"
+#line 5434 "VideoSupport.c"
 			}
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5270 "VideoSupport.c"
+#line 5438 "VideoSupport.c"
 		}
-		__finally501:
+		__finally503:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5279 "VideoSupport.c"
+#line 5447 "VideoSupport.c"
 		}
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 5287 "VideoSupport.c"
+#line 5455 "VideoSupport.c"
 	}
 }
 
@@ -5302,44 +5470,44 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5310 "VideoSupport.c"
+#line 5478 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5317 "VideoSupport.c"
+#line 5485 "VideoSupport.c"
 	}
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5339 "VideoSupport.c"
+#line 5507 "VideoSupport.c"
 }
 
 
@@ -5350,13 +5518,13 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	VideoRow* _tmp9_ = NULL;
 	Video* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 565 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5356 "VideoSupport.c"
+#line 5524 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_ = NULL;
@@ -5366,188 +5534,188 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		VideoID _tmp5_ = {0};
 		VideoID _tmp6_ = {0};
 		gboolean _tmp7_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5386 "VideoSupport.c"
-				goto __catch502_database_error;
+#line 5554 "VideoSupport.c"
+				goto __catch504_database_error;
 			}
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5395 "VideoSupport.c"
+#line 5563 "VideoSupport.c"
 		}
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp7_) {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5407 "VideoSupport.c"
+#line 5575 "VideoSupport.c"
 			} else {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5411 "VideoSupport.c"
+#line 5579 "VideoSupport.c"
 			}
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5415 "VideoSupport.c"
+#line 5583 "VideoSupport.c"
 		}
 	}
-	goto __finally502;
-	__catch502_database_error:
+	goto __finally504;
+	__catch504_database_error:
 	{
 		GError* err = NULL;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5434 "VideoSupport.c"
+#line 5602 "VideoSupport.c"
 		} else {
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5438 "VideoSupport.c"
+#line 5606 "VideoSupport.c"
 		}
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5442 "VideoSupport.c"
+#line 5610 "VideoSupport.c"
 	}
-	__finally502:
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally504:
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5453 "VideoSupport.c"
+#line 5621 "VideoSupport.c"
 	}
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5471 "VideoSupport.c"
+#line 5639 "VideoSupport.c"
 	} else {
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5475 "VideoSupport.c"
+#line 5643 "VideoSupport.c"
 	}
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5479 "VideoSupport.c"
+#line 5647 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5487 "VideoSupport.c"
+#line 5655 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		Video* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5509 "VideoSupport.c"
-				goto __catch503_database_error;
+#line 5677 "VideoSupport.c"
+				goto __catch505_database_error;
 			}
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5518 "VideoSupport.c"
+#line 5686 "VideoSupport.c"
 		}
 	}
-	goto __finally503;
-	__catch503_database_error:
+	goto __finally505;
+	__catch505_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp4_);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5536 "VideoSupport.c"
+#line 5704 "VideoSupport.c"
 	}
-	__finally503:
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally505:
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5547 "VideoSupport.c"
+#line 5715 "VideoSupport.c"
 	}
 }
 
@@ -5562,24 +5730,24 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp13_ = NULL;
 	gint _tmp13__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5572 "VideoSupport.c"
+#line 5740 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5579 "VideoSupport.c"
+#line 5747 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -5591,69 +5759,69 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			const gchar* _tmp9_ = NULL;
 			BackingFileState* _tmp10_ = NULL;
 			BackingFileState* _tmp11_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5615 "VideoSupport.c"
+#line 5783 "VideoSupport.c"
 		}
-		__finally504:
+		__finally506:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5624 "VideoSupport.c"
+#line 5792 "VideoSupport.c"
 		}
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5636 "VideoSupport.c"
+#line 5804 "VideoSupport.c"
 		}
 	}
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5647 "VideoSupport.c"
+#line 5815 "VideoSupport.c"
 	}
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5653 "VideoSupport.c"
+#line 5821 "VideoSupport.c"
 }
 
 
@@ -5665,33 +5833,33 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5679 "VideoSupport.c"
+#line 5847 "VideoSupport.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5691 "VideoSupport.c"
+#line 5859 "VideoSupport.c"
 }
 
 
@@ -5699,57 +5867,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5701 "VideoSupport.c"
+#line 5869 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5708 "VideoSupport.c"
+#line 5876 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5721 "VideoSupport.c"
+#line 5889 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5728 "VideoSupport.c"
+#line 5896 "VideoSupport.c"
 			}
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5732 "VideoSupport.c"
+#line 5900 "VideoSupport.c"
 		}
-		__finally505:
+		__finally507:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5741 "VideoSupport.c"
+#line 5909 "VideoSupport.c"
 		}
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5749 "VideoSupport.c"
+#line 5917 "VideoSupport.c"
 	}
 }
 
@@ -5761,31 +5929,31 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5775 "VideoSupport.c"
+#line 5943 "VideoSupport.c"
 	}
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5785 "VideoSupport.c"
+#line 5953 "VideoSupport.c"
 }
 
 
@@ -5802,69 +5970,69 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GdkPixbuf* _tmp7_ = NULL;
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp3_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5826 "VideoSupport.c"
+#line 5994 "VideoSupport.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5837 "VideoSupport.c"
+#line 6005 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5854 "VideoSupport.c"
+#line 6022 "VideoSupport.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5864 "VideoSupport.c"
+#line 6032 "VideoSupport.c"
 }
 
 
@@ -5872,15 +6040,15 @@ static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5880 "VideoSupport.c"
+#line 6048 "VideoSupport.c"
 }
 
 
@@ -5889,71 +6057,71 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5899 "VideoSupport.c"
+#line 6067 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5908 "VideoSupport.c"
+#line 6076 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5915 "VideoSupport.c"
+#line 6083 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 5925 "VideoSupport.c"
+#line 6093 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5932 "VideoSupport.c"
+#line 6100 "VideoSupport.c"
 			}
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5936 "VideoSupport.c"
+#line 6104 "VideoSupport.c"
 		}
-		__finally506:
+		__finally508:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5945 "VideoSupport.c"
+#line 6113 "VideoSupport.c"
 		}
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5953 "VideoSupport.c"
+#line 6121 "VideoSupport.c"
 	}
 }
 
@@ -5962,15 +6130,15 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Video * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5970 "VideoSupport.c"
+#line 6138 "VideoSupport.c"
 }
 
 
@@ -5978,57 +6146,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5980 "VideoSupport.c"
+#line 6148 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5987 "VideoSupport.c"
+#line 6155 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6000 "VideoSupport.c"
+#line 6168 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6007 "VideoSupport.c"
+#line 6175 "VideoSupport.c"
 			}
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6011 "VideoSupport.c"
+#line 6179 "VideoSupport.c"
 		}
-		__finally507:
+		__finally509:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6020 "VideoSupport.c"
+#line 6188 "VideoSupport.c"
 		}
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6028 "VideoSupport.c"
+#line 6196 "VideoSupport.c"
 	}
 }
 
@@ -6041,22 +6209,22 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6049 "VideoSupport.c"
+#line 6217 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6056 "VideoSupport.c"
+#line 6224 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6064,28 +6232,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6072 "VideoSupport.c"
+#line 6240 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6079 "VideoSupport.c"
+#line 6247 "VideoSupport.c"
 				}
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6085 "VideoSupport.c"
+#line 6253 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6093,143 +6261,143 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6111 "VideoSupport.c"
-						goto __catch509_database_error;
+#line 6279 "VideoSupport.c"
+						goto __catch511_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6120 "VideoSupport.c"
+#line 6288 "VideoSupport.c"
 					}
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6130 "VideoSupport.c"
+#line 6298 "VideoSupport.c"
 				}
 			}
-			goto __finally509;
-			__catch509_database_error:
+			goto __finally511;
+			__catch511_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6148 "VideoSupport.c"
+#line 6316 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6155 "VideoSupport.c"
+#line 6323 "VideoSupport.c"
 				}
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6161 "VideoSupport.c"
+#line 6329 "VideoSupport.c"
 			}
-			__finally509:
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally511:
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6166 "VideoSupport.c"
+#line 6334 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6173 "VideoSupport.c"
+#line 6341 "VideoSupport.c"
 				}
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6183 "VideoSupport.c"
+#line 6351 "VideoSupport.c"
 			}
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6195 "VideoSupport.c"
+#line 6363 "VideoSupport.c"
 		}
-		__finally508:
+		__finally510:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6204 "VideoSupport.c"
+#line 6372 "VideoSupport.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6216 "VideoSupport.c"
+#line 6384 "VideoSupport.c"
 		}
 	}
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6229 "VideoSupport.c"
+#line 6397 "VideoSupport.c"
 }
 
 
@@ -6237,57 +6405,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6239 "VideoSupport.c"
+#line 6407 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6246 "VideoSupport.c"
+#line 6414 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6259 "VideoSupport.c"
+#line 6427 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6266 "VideoSupport.c"
+#line 6434 "VideoSupport.c"
 			}
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6270 "VideoSupport.c"
+#line 6438 "VideoSupport.c"
 		}
-		__finally510:
+		__finally512:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6279 "VideoSupport.c"
+#line 6447 "VideoSupport.c"
 		}
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6287 "VideoSupport.c"
+#line 6455 "VideoSupport.c"
 	}
 }
 
@@ -6301,22 +6469,22 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6309 "VideoSupport.c"
+#line 6477 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6316 "VideoSupport.c"
+#line 6484 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6324,30 +6492,30 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6334 "VideoSupport.c"
+#line 6502 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6341 "VideoSupport.c"
+#line 6509 "VideoSupport.c"
 				}
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6347 "VideoSupport.c"
+#line 6515 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6355,149 +6523,149 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6373 "VideoSupport.c"
-						goto __catch512_database_error;
+#line 6541 "VideoSupport.c"
+						goto __catch514_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6382 "VideoSupport.c"
+#line 6550 "VideoSupport.c"
 					}
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return FALSE;
-#line 6392 "VideoSupport.c"
+#line 6560 "VideoSupport.c"
 				}
 			}
-			goto __finally512;
-			__catch512_database_error:
+			goto __finally514;
+			__catch514_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6412 "VideoSupport.c"
+#line 6580 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6419 "VideoSupport.c"
+#line 6587 "VideoSupport.c"
 				}
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6425 "VideoSupport.c"
+#line 6593 "VideoSupport.c"
 			}
-			__finally512:
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally514:
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6430 "VideoSupport.c"
+#line 6598 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6437 "VideoSupport.c"
+#line 6605 "VideoSupport.c"
 				}
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return FALSE;
-#line 6447 "VideoSupport.c"
+#line 6615 "VideoSupport.c"
 			}
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_comment;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->comment);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->comment = _tmp18_;
-#line 6459 "VideoSupport.c"
+#line 6627 "VideoSupport.c"
 		}
-		__finally511:
+		__finally513:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6468 "VideoSupport.c"
+#line 6636 "VideoSupport.c"
 		}
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return FALSE;
-#line 6480 "VideoSupport.c"
+#line 6648 "VideoSupport.c"
 		}
 	}
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "comment");
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6497 "VideoSupport.c"
+#line 6665 "VideoSupport.c"
 }
 
 
@@ -6505,54 +6673,54 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6507 "VideoSupport.c"
+#line 6675 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6514 "VideoSupport.c"
+#line 6682 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6524 "VideoSupport.c"
+#line 6692 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6531 "VideoSupport.c"
+#line 6699 "VideoSupport.c"
 			}
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6535 "VideoSupport.c"
+#line 6703 "VideoSupport.c"
 		}
-		__finally513:
+		__finally515:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6544 "VideoSupport.c"
+#line 6712 "VideoSupport.c"
 		}
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6552 "VideoSupport.c"
+#line 6720 "VideoSupport.c"
 	}
 }
 
@@ -6562,234 +6730,234 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 688 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6564 "VideoSupport.c"
+#line 6732 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6571 "VideoSupport.c"
+#line 6739 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp16_ = NULL;
 			Rating _tmp17_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6586 "VideoSupport.c"
+#line 6754 "VideoSupport.c"
 			} else {
 				Rating _tmp4_ = 0;
 				VideoRow* _tmp5_ = NULL;
 				Rating _tmp6_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6599 "VideoSupport.c"
+#line 6767 "VideoSupport.c"
 			}
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6603 "VideoSupport.c"
+#line 6771 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6610 "VideoSupport.c"
+#line 6778 "VideoSupport.c"
 				}
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6614 "VideoSupport.c"
+#line 6782 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_ = NULL;
 				VideoTable* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				Rating _tmp11_ = 0;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6637 "VideoSupport.c"
-						goto __catch515_database_error;
+#line 6805 "VideoSupport.c"
+						goto __catch517_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6646 "VideoSupport.c"
+#line 6814 "VideoSupport.c"
 					}
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6654 "VideoSupport.c"
+#line 6822 "VideoSupport.c"
 				}
 			}
-			goto __finally515;
-			__catch515_database_error:
+			goto __finally517;
+			__catch517_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6672 "VideoSupport.c"
+#line 6840 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6679 "VideoSupport.c"
+#line 6847 "VideoSupport.c"
 				}
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6683 "VideoSupport.c"
+#line 6851 "VideoSupport.c"
 			}
-			__finally515:
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally517:
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6688 "VideoSupport.c"
+#line 6856 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6695 "VideoSupport.c"
+#line 6863 "VideoSupport.c"
 				}
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6703 "VideoSupport.c"
+#line 6871 "VideoSupport.c"
 			}
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6711 "VideoSupport.c"
+#line 6879 "VideoSupport.c"
 		}
-		__finally514:
+		__finally516:
 		{
 			VideoRow* _tmp18_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6720 "VideoSupport.c"
+#line 6888 "VideoSupport.c"
 		}
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6730 "VideoSupport.c"
+#line 6898 "VideoSupport.c"
 		}
 	}
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6741 "VideoSupport.c"
+#line 6909 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6750 "VideoSupport.c"
+#line 6918 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6757 "VideoSupport.c"
+#line 6925 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6770 "VideoSupport.c"
+#line 6938 "VideoSupport.c"
 		}
-		__finally516:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6779 "VideoSupport.c"
+#line 6947 "VideoSupport.c"
 		}
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6789 "VideoSupport.c"
+#line 6957 "VideoSupport.c"
 		}
 	}
 }
@@ -6798,48 +6966,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6800 "VideoSupport.c"
+#line 6968 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6807 "VideoSupport.c"
+#line 6975 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6820 "VideoSupport.c"
+#line 6988 "VideoSupport.c"
 		}
-		__finally517:
+		__finally519:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6829 "VideoSupport.c"
+#line 6997 "VideoSupport.c"
 		}
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6839 "VideoSupport.c"
+#line 7007 "VideoSupport.c"
 		}
 	}
 }
@@ -6849,15 +7017,15 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 719 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6857 "VideoSupport.c"
+#line 7025 "VideoSupport.c"
 }
 
 
@@ -6865,25 +7033,25 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6873 "VideoSupport.c"
+#line 7041 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6883 "VideoSupport.c"
+#line 7051 "VideoSupport.c"
 }
 
 
@@ -6891,61 +7059,61 @@ static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 6899 "VideoSupport.c"
+#line 7067 "VideoSupport.c"
 		gboolean _tmp2_ = FALSE;
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 6905 "VideoSupport.c"
+#line 7073 "VideoSupport.c"
 	} else {
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 6909 "VideoSupport.c"
+#line 7077 "VideoSupport.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 6913 "VideoSupport.c"
+#line 7081 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_ = NULL;
 		VideoInterpretableResults* _tmp4_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 6924 "VideoSupport.c"
+#line 7092 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6935 "VideoSupport.c"
+#line 7103 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6945 "VideoSupport.c"
+#line 7113 "VideoSupport.c"
 }
 
 
@@ -6953,15 +7121,15 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 762 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6961 "VideoSupport.c"
+#line 7129 "VideoSupport.c"
 }
 
 
@@ -6969,17 +7137,17 @@ static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6979 "VideoSupport.c"
+#line 7147 "VideoSupport.c"
 }
 
 
@@ -6987,71 +7155,71 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6997 "VideoSupport.c"
+#line 7165 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7006 "VideoSupport.c"
+#line 7174 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7013 "VideoSupport.c"
+#line 7181 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			EventID _tmp2_ = {0};
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7023 "VideoSupport.c"
+#line 7191 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7030 "VideoSupport.c"
+#line 7198 "VideoSupport.c"
 			}
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7034 "VideoSupport.c"
+#line 7202 "VideoSupport.c"
 		}
-		__finally518:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7043 "VideoSupport.c"
+#line 7211 "VideoSupport.c"
 		}
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7051 "VideoSupport.c"
+#line 7219 "VideoSupport.c"
 	}
 }
 
@@ -7060,16 +7228,16 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7062 "VideoSupport.c"
+#line 7230 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7069 "VideoSupport.c"
+#line 7237 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7080,111 +7248,111 @@ static gchar* video_real_to_string (DataObject* base) {
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7102 "VideoSupport.c"
+#line 7270 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7109 "VideoSupport.c"
+#line 7277 "VideoSupport.c"
 			}
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7113 "VideoSupport.c"
+#line 7281 "VideoSupport.c"
 		}
-		__finally519:
+		__finally521:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7122 "VideoSupport.c"
+#line 7290 "VideoSupport.c"
 		}
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7130 "VideoSupport.c"
+#line 7298 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7139 "VideoSupport.c"
+#line 7307 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7146 "VideoSupport.c"
+#line 7314 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7156 "VideoSupport.c"
+#line 7324 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7163 "VideoSupport.c"
+#line 7331 "VideoSupport.c"
 			}
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7167 "VideoSupport.c"
+#line 7335 "VideoSupport.c"
 		}
-		__finally520:
+		__finally522:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7176 "VideoSupport.c"
+#line 7344 "VideoSupport.c"
 		}
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7184 "VideoSupport.c"
+#line 7352 "VideoSupport.c"
 	}
 }
 
@@ -7193,54 +7361,54 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7195 "VideoSupport.c"
+#line 7363 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7202 "VideoSupport.c"
+#line 7370 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7212 "VideoSupport.c"
+#line 7380 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7219 "VideoSupport.c"
+#line 7387 "VideoSupport.c"
 			}
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7223 "VideoSupport.c"
+#line 7391 "VideoSupport.c"
 		}
-		__finally521:
+		__finally523:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7232 "VideoSupport.c"
+#line 7400 "VideoSupport.c"
 		}
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7240 "VideoSupport.c"
+#line 7408 "VideoSupport.c"
 	}
 }
 
@@ -7250,16 +7418,16 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Alteration* _tmp12_ = NULL;
 	Alteration* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7252 "VideoSupport.c"
+#line 7420 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7259 "VideoSupport.c"
+#line 7427 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_ = NULL;
 			time_t _tmp10_ = 0;
@@ -7269,165 +7437,165 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				VideoRow* _tmp3_ = NULL;
 				VideoID _tmp4_ = {0};
 				time_t _tmp5_ = 0;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7285 "VideoSupport.c"
-					goto __catch523_g_error;
+#line 7453 "VideoSupport.c"
+					goto __catch525_g_error;
 				}
 			}
-			goto __finally523;
-			__catch523_g_error:
+			goto __finally525;
+			__catch525_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:787: Warning - %s", _tmp7_);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:803: Warning - %s", _tmp7_);
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7307 "VideoSupport.c"
+#line 7475 "VideoSupport.c"
 			}
-			__finally523:
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally525:
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7312 "VideoSupport.c"
+#line 7480 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7319 "VideoSupport.c"
+#line 7487 "VideoSupport.c"
 				}
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7327 "VideoSupport.c"
+#line 7495 "VideoSupport.c"
 			}
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7335 "VideoSupport.c"
+#line 7503 "VideoSupport.c"
 		}
-		__finally522:
+		__finally524:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7344 "VideoSupport.c"
+#line 7512 "VideoSupport.c"
 		}
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7354 "VideoSupport.c"
+#line 7522 "VideoSupport.c"
 		}
 	}
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7365 "VideoSupport.c"
+#line 7533 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7373 "VideoSupport.c"
+#line 7541 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7380 "VideoSupport.c"
+#line 7548 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint _tmp2_ = 0;
 			VideoRow* _tmp3_ = NULL;
 			gint _tmp4_ = 0;
 			Dimensions _tmp5_ = {0};
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7399 "VideoSupport.c"
+#line 7567 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7406 "VideoSupport.c"
+#line 7574 "VideoSupport.c"
 			}
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7410 "VideoSupport.c"
+#line 7578 "VideoSupport.c"
 		}
-		__finally524:
+		__finally526:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7419 "VideoSupport.c"
+#line 7587 "VideoSupport.c"
 		}
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7427 "VideoSupport.c"
+#line 7595 "VideoSupport.c"
 	}
 }
 
@@ -7435,15 +7603,15 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) {
 	Video * self;
 	Dimensions _tmp0_ = {0};
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7443 "VideoSupport.c"
+#line 7611 "VideoSupport.c"
 }
 
 
@@ -7451,15 +7619,15 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	guint64 _tmp0_ = 0ULL;
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7459 "VideoSupport.c"
+#line 7627 "VideoSupport.c"
 }
 
 
@@ -7467,54 +7635,54 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7469 "VideoSupport.c"
+#line 7637 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7476 "VideoSupport.c"
+#line 7644 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7486 "VideoSupport.c"
+#line 7654 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7493 "VideoSupport.c"
+#line 7661 "VideoSupport.c"
 			}
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7497 "VideoSupport.c"
+#line 7665 "VideoSupport.c"
 		}
-		__finally525:
+		__finally527:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7506 "VideoSupport.c"
+#line 7674 "VideoSupport.c"
 		}
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0ULL;
-#line 7514 "VideoSupport.c"
+#line 7682 "VideoSupport.c"
 	}
 }
 
@@ -7523,54 +7691,54 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7525 "VideoSupport.c"
+#line 7693 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7532 "VideoSupport.c"
+#line 7700 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7542 "VideoSupport.c"
+#line 7710 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7549 "VideoSupport.c"
+#line 7717 "VideoSupport.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7553 "VideoSupport.c"
+#line 7721 "VideoSupport.c"
 		}
-		__finally526:
+		__finally528:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7562 "VideoSupport.c"
+#line 7730 "VideoSupport.c"
 		}
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7570 "VideoSupport.c"
+#line 7738 "VideoSupport.c"
 	}
 }
 
@@ -7583,25 +7751,25 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7593 "VideoSupport.c"
+#line 7761 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7601 "VideoSupport.c"
+#line 7769 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				time_t _tmp4_ = 0;
@@ -7616,182 +7784,182 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				VideoRow* _tmp14_ = NULL;
 				GTimeVal _tmp15_ = {0};
 				glong _tmp16_ = 0L;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7626 "VideoSupport.c"
+#line 7794 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7633 "VideoSupport.c"
+#line 7801 "VideoSupport.c"
 					}
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7637 "VideoSupport.c"
+#line 7805 "VideoSupport.c"
 				}
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7657 "VideoSupport.c"
-					goto __finally528;
+#line 7825 "VideoSupport.c"
+					goto __finally530;
 				}
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7668 "VideoSupport.c"
+#line 7836 "VideoSupport.c"
 			}
-			__finally528:
+			__finally530:
 			{
 				VideoRow* _tmp17_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7677 "VideoSupport.c"
+#line 7845 "VideoSupport.c"
 			}
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7683 "VideoSupport.c"
-					goto __catch527_database_error;
+#line 7851 "VideoSupport.c"
+					goto __catch529_database_error;
 				}
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7692 "VideoSupport.c"
+#line 7860 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally527;
-	__catch527_database_error:
+	goto __finally529;
+	__catch529_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7713 "VideoSupport.c"
+#line 7881 "VideoSupport.c"
 	}
-	__finally527:
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally529:
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7724 "VideoSupport.c"
+#line 7892 "VideoSupport.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7734 "VideoSupport.c"
+#line 7902 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7743 "VideoSupport.c"
+#line 7911 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7750 "VideoSupport.c"
+#line 7918 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7763 "VideoSupport.c"
+#line 7931 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7770 "VideoSupport.c"
+#line 7938 "VideoSupport.c"
 			}
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7774 "VideoSupport.c"
+#line 7942 "VideoSupport.c"
 		}
-		__finally529:
+		__finally531:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7783 "VideoSupport.c"
+#line 7951 "VideoSupport.c"
 		}
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7791 "VideoSupport.c"
+#line 7959 "VideoSupport.c"
 	}
 }
 
@@ -7803,23 +7971,23 @@ static GFile* video_real_get_file (MediaSource* base) {
 	gchar* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7819 "VideoSupport.c"
+#line 7987 "VideoSupport.c"
 }
 
 
@@ -7827,15 +7995,15 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7835 "VideoSupport.c"
+#line 8003 "VideoSupport.c"
 }
 
 
@@ -7847,93 +8015,93 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7875 "VideoSupport.c"
+#line 8043 "VideoSupport.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7879 "VideoSupport.c"
+#line 8047 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 7888 "VideoSupport.c"
+#line 8056 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7895 "VideoSupport.c"
+#line 8063 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gdouble _tmp2_ = 0.0;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7905 "VideoSupport.c"
+#line 8073 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7912 "VideoSupport.c"
+#line 8080 "VideoSupport.c"
 			}
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7916 "VideoSupport.c"
+#line 8084 "VideoSupport.c"
 		}
-		__finally530:
+		__finally532:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7925 "VideoSupport.c"
+#line 8093 "VideoSupport.c"
 		}
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0.0;
-#line 7933 "VideoSupport.c"
+#line 8101 "VideoSupport.c"
 	}
 }
 
@@ -7941,123 +8109,123 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 7943 "VideoSupport.c"
+#line 8111 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7950 "VideoSupport.c"
+#line 8118 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7960 "VideoSupport.c"
+#line 8128 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7967 "VideoSupport.c"
+#line 8135 "VideoSupport.c"
 			}
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7971 "VideoSupport.c"
+#line 8139 "VideoSupport.c"
 		}
-		__finally531:
+		__finally533:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7980 "VideoSupport.c"
+#line 8148 "VideoSupport.c"
 		}
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 7988 "VideoSupport.c"
+#line 8156 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7997 "VideoSupport.c"
+#line 8165 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8004 "VideoSupport.c"
+#line 8172 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8019 "VideoSupport.c"
+#line 8187 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8026 "VideoSupport.c"
+#line 8194 "VideoSupport.c"
 				}
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8030 "VideoSupport.c"
+#line 8198 "VideoSupport.c"
 			}
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8038 "VideoSupport.c"
+#line 8206 "VideoSupport.c"
 		}
-		__finally532:
+		__finally534:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8047 "VideoSupport.c"
+#line 8215 "VideoSupport.c"
 		}
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8057 "VideoSupport.c"
+#line 8225 "VideoSupport.c"
 		}
 	}
 	{
@@ -8065,61 +8233,61 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		VideoTable* _tmp9_ = NULL;
 		VideoID _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8081 "VideoSupport.c"
-				goto __catch533_database_error;
+#line 8249 "VideoSupport.c"
+				goto __catch535_database_error;
 			}
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8090 "VideoSupport.c"
+#line 8258 "VideoSupport.c"
 		}
 	}
-	goto __finally533;
-	__catch533_database_error:
+	goto __finally535;
+	__catch535_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp12_);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8108 "VideoSupport.c"
+#line 8276 "VideoSupport.c"
 	}
-	__finally533:
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally535:
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8119 "VideoSupport.c"
+#line 8287 "VideoSupport.c"
 	}
 }
 
@@ -8146,235 +8314,235 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GdkPixbuf* _tmp27_ = NULL;
 	GdkPixbuf* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = -1.0;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8168 "VideoSupport.c"
+#line 8336 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_ = NULL;
 		gdouble _tmp7_ = 0.0;
 		VideoReader* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8185 "VideoSupport.c"
-				goto __catch534_video_error;
+#line 8353 "VideoSupport.c"
+				goto __catch536_video_error;
 			}
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8200 "VideoSupport.c"
+#line 8368 "VideoSupport.c"
 		}
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8212 "VideoSupport.c"
+#line 8380 "VideoSupport.c"
 	}
-	goto __finally534;
-	__catch534_video_error:
+	goto __finally536;
+	__catch536_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		VideoInterpretableResults* _tmp12_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_->update_interpretable = _tmp11_;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8245 "VideoSupport.c"
+#line 8413 "VideoSupport.c"
 	}
-	__finally534:
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally536:
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8262 "VideoSupport.c"
+#line 8430 "VideoSupport.c"
 	}
-#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_) {
-#line 8268 "VideoSupport.c"
+#line 8436 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_ = NULL;
 		VideoInterpretableResults* _tmp15_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_->update_interpretable = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8287 "VideoSupport.c"
+#line 8455 "VideoSupport.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:918: video %s has become interpretable", _tmp19_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:934: video %s has become interpretable", _tmp19_);
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8303 "VideoSupport.c"
+#line 8471 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8310 "VideoSupport.c"
+#line 8478 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_ = NULL;
 			gdouble _tmp22_ = 0.0;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8320 "VideoSupport.c"
+#line 8488 "VideoSupport.c"
 		}
-		__finally535:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8329 "VideoSupport.c"
+#line 8497 "VideoSupport.c"
 		}
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8345 "VideoSupport.c"
+#line 8513 "VideoSupport.c"
 		}
 	}
-#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_->update_interpretable = TRUE;
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_->is_interpretable = TRUE;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8374 "VideoSupport.c"
+#line 8542 "VideoSupport.c"
 }
 
 
@@ -8383,81 +8551,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8391 "VideoSupport.c"
+#line 8559 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_ = NULL;
 		VideoTable* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8410 "VideoSupport.c"
-				goto __catch536_database_error;
+#line 8578 "VideoSupport.c"
+				goto __catch538_database_error;
 			}
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8419 "VideoSupport.c"
+#line 8587 "VideoSupport.c"
 		}
 	}
-	goto __finally536;
-	__catch536_database_error:
+	goto __finally538;
+	__catch538_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:940: failed to remove video %s from video table", _tmp5_);
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:956: failed to remove video %s from video table", _tmp5_);
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8442 "VideoSupport.c"
+#line 8610 "VideoSupport.c"
 	}
-	__finally536:
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally538:
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8453 "VideoSupport.c"
+#line 8621 "VideoSupport.c"
 	}
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource));
-#line 8457 "VideoSupport.c"
+#line 8625 "VideoSupport.c"
 }
 
 
@@ -8470,39 +8638,39 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 8486 "VideoSupport.c"
+#line 8654 "VideoSupport.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8492 "VideoSupport.c"
+#line 8660 "VideoSupport.c"
 	} else {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8496 "VideoSupport.c"
+#line 8664 "VideoSupport.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8502 "VideoSupport.c"
+#line 8670 "VideoSupport.c"
 }
 
 
@@ -8511,41 +8679,41 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8523 "VideoSupport.c"
+#line 8691 "VideoSupport.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8537 "VideoSupport.c"
+#line 8705 "VideoSupport.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8545 "VideoSupport.c"
+#line 8713 "VideoSupport.c"
 }
 
 
@@ -8554,18 +8722,18 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8558 "VideoSupport.c"
+#line 8726 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8565 "VideoSupport.c"
+#line 8733 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8576,180 +8744,180 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8594 "VideoSupport.c"
+#line 8762 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8603 "VideoSupport.c"
+#line 8771 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8610 "VideoSupport.c"
+#line 8778 "VideoSupport.c"
 				}
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8614 "VideoSupport.c"
+#line 8782 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8637 "VideoSupport.c"
-						goto __catch538_database_error;
+#line 8805 "VideoSupport.c"
+						goto __catch540_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8646 "VideoSupport.c"
+#line 8814 "VideoSupport.c"
 					}
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8654 "VideoSupport.c"
+#line 8822 "VideoSupport.c"
 				}
 			}
-			goto __finally538;
-			__catch538_database_error:
+			goto __finally540;
+			__catch540_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8680 "VideoSupport.c"
+#line 8848 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8687 "VideoSupport.c"
+#line 8855 "VideoSupport.c"
 				}
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8691 "VideoSupport.c"
+#line 8859 "VideoSupport.c"
 			}
-			__finally538:
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally540:
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8696 "VideoSupport.c"
+#line 8864 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8703 "VideoSupport.c"
+#line 8871 "VideoSupport.c"
 				}
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8711 "VideoSupport.c"
+#line 8879 "VideoSupport.c"
 			}
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8719 "VideoSupport.c"
+#line 8887 "VideoSupport.c"
 		}
-		__finally537:
+		__finally539:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8728 "VideoSupport.c"
+#line 8896 "VideoSupport.c"
 		}
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8738 "VideoSupport.c"
+#line 8906 "VideoSupport.c"
 		}
 	}
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8749 "VideoSupport.c"
+#line 8917 "VideoSupport.c"
 }
 
 
@@ -8758,18 +8926,18 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8762 "VideoSupport.c"
+#line 8930 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8769 "VideoSupport.c"
+#line 8937 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8780,240 +8948,240 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8798 "VideoSupport.c"
+#line 8966 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8807 "VideoSupport.c"
+#line 8975 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8814 "VideoSupport.c"
+#line 8982 "VideoSupport.c"
 				}
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8818 "VideoSupport.c"
+#line 8986 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8841 "VideoSupport.c"
-						goto __catch540_database_error;
+#line 9009 "VideoSupport.c"
+						goto __catch542_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8850 "VideoSupport.c"
+#line 9018 "VideoSupport.c"
 					}
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8858 "VideoSupport.c"
+#line 9026 "VideoSupport.c"
 				}
 			}
-			goto __finally540;
-			__catch540_database_error:
+			goto __finally542;
+			__catch542_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8884 "VideoSupport.c"
+#line 9052 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8891 "VideoSupport.c"
+#line 9059 "VideoSupport.c"
 				}
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8895 "VideoSupport.c"
+#line 9063 "VideoSupport.c"
 			}
-			__finally540:
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally542:
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8900 "VideoSupport.c"
+#line 9068 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8907 "VideoSupport.c"
+#line 9075 "VideoSupport.c"
 				}
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8915 "VideoSupport.c"
+#line 9083 "VideoSupport.c"
 			}
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8923 "VideoSupport.c"
+#line 9091 "VideoSupport.c"
 		}
-		__finally539:
+		__finally541:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8932 "VideoSupport.c"
+#line 9100 "VideoSupport.c"
 		}
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8942 "VideoSupport.c"
+#line 9110 "VideoSupport.c"
 		}
 	}
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8953 "VideoSupport.c"
+#line 9121 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8962 "VideoSupport.c"
+#line 9130 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8969 "VideoSupport.c"
+#line 9137 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 8985 "VideoSupport.c"
+#line 9153 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8992 "VideoSupport.c"
+#line 9160 "VideoSupport.c"
 			}
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8996 "VideoSupport.c"
+#line 9164 "VideoSupport.c"
 		}
-		__finally541:
+		__finally543:
 		{
 			VideoRow* _tmp6_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9005 "VideoSupport.c"
+#line 9173 "VideoSupport.c"
 		}
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 9013 "VideoSupport.c"
+#line 9181 "VideoSupport.c"
 	}
 }
 
@@ -9032,27 +9200,27 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Alteration* _tmp25_ = NULL;
 	Alteration* _tmp26_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_filepath = _tmp1_;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9044 "VideoSupport.c"
+#line 9212 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9052 "VideoSupport.c"
+#line 9220 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
@@ -9068,169 +9236,169 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				VideoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9076 "VideoSupport.c"
+#line 9244 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9083 "VideoSupport.c"
+#line 9251 "VideoSupport.c"
 					}
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9091 "VideoSupport.c"
+#line 9259 "VideoSupport.c"
 				}
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9119 "VideoSupport.c"
-					goto __finally543;
+#line 9287 "VideoSupport.c"
+					goto __finally545;
 				}
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9132 "VideoSupport.c"
+#line 9300 "VideoSupport.c"
 			}
-			__finally543:
+			__finally545:
 			{
 				VideoRow* _tmp18_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9141 "VideoSupport.c"
+#line 9309 "VideoSupport.c"
 			}
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9147 "VideoSupport.c"
-					goto __catch542_database_error;
+#line 9315 "VideoSupport.c"
+					goto __catch544_database_error;
 				}
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9160 "VideoSupport.c"
+#line 9328 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally542;
-	__catch542_database_error:
+	goto __finally544;
+	__catch544_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9185 "VideoSupport.c"
+#line 9353 "VideoSupport.c"
 	}
-	__finally542:
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally544:
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9200 "VideoSupport.c"
+#line 9368 "VideoSupport.c"
 	}
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9230 "VideoSupport.c"
+#line 9398 "VideoSupport.c"
 }
 
 
@@ -9245,45 +9413,45 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* _tmp6_ = NULL;
 	VideoMetadata* _tmp7_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9271 "VideoSupport.c"
+#line 9439 "VideoSupport.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9283 "VideoSupport.c"
+#line 9451 "VideoSupport.c"
 }
 
 
@@ -9291,28 +9459,28 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	VideoInterpretableResults* self = NULL;
 	Video* _tmp0_ = NULL;
 	Video* _tmp1_ = NULL;
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->video = _tmp1_;
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9305 "VideoSupport.c"
+#line 9473 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9312 "VideoSupport.c"
+#line 9480 "VideoSupport.c"
 }
 
 
@@ -9320,64 +9488,64 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	gboolean _tmp0_ = FALSE;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (VIDEO_IS_INTERPRETABLE_RESULTS (self));
-#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->update_interpretable;
-#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9326 "VideoSupport.c"
+#line 9494 "VideoSupport.c"
 		Video* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->video;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->is_interpretable;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9335 "VideoSupport.c"
+#line 9503 "VideoSupport.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
-#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9341 "VideoSupport.c"
+#line 9509 "VideoSupport.c"
 		{
 			Video* _tmp4_ = NULL;
 			GdkPixbuf* _tmp5_ = NULL;
 			Video* _tmp6_ = NULL;
 			GdkPixbuf* _tmp7_ = NULL;
 			Video* _tmp8_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->video;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->new_thumbnail;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9356 "VideoSupport.c"
-				goto __catch544_g_error;
+#line 9524 "VideoSupport.c"
+				goto __catch546_g_error;
 			}
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->new_thumbnail;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9367 "VideoSupport.c"
-				goto __catch544_g_error;
+#line 9535 "VideoSupport.c"
+				goto __catch546_g_error;
 			}
-#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
-#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9374 "VideoSupport.c"
+#line 9542 "VideoSupport.c"
 		}
-		goto __finally544;
-		__catch544_g_error:
+		goto __finally546;
+		__catch546_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9385,256 +9553,256 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->video;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = err;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:334: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:350: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp11_);
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9405 "VideoSupport.c"
+#line 9573 "VideoSupport.c"
 		}
-		__finally544:
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally546:
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9416 "VideoSupport.c"
+#line 9584 "VideoSupport.c"
 		}
 	}
 }
 
 
 static void video_value_interpretable_results_init (GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9425 "VideoSupport.c"
+#line 9593 "VideoSupport.c"
 }
 
 
 static void video_value_interpretable_results_free_value (GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9434 "VideoSupport.c"
+#line 9602 "VideoSupport.c"
 	}
 }
 
 
 static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9444 "VideoSupport.c"
+#line 9612 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9448 "VideoSupport.c"
+#line 9616 "VideoSupport.c"
 	}
 }
 
 
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9456 "VideoSupport.c"
+#line 9624 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9463 "VideoSupport.c"
+#line 9631 "VideoSupport.c"
 		VideoInterpretableResults* object;
 		object = collect_values[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9470 "VideoSupport.c"
+#line 9638 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9474 "VideoSupport.c"
+#line 9642 "VideoSupport.c"
 		}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9478 "VideoSupport.c"
+#line 9646 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9482 "VideoSupport.c"
+#line 9650 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9486 "VideoSupport.c"
+#line 9654 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	VideoInterpretableResults** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9497 "VideoSupport.c"
+#line 9665 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9503 "VideoSupport.c"
+#line 9671 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9507 "VideoSupport.c"
+#line 9675 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9511 "VideoSupport.c"
+#line 9679 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9515 "VideoSupport.c"
+#line 9683 "VideoSupport.c"
 }
 
 
 GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	VideoParamSpecInterpretableResults* spec;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9529 "VideoSupport.c"
+#line 9697 "VideoSupport.c"
 }
 
 
 gpointer video_value_get_interpretable_results (const GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9538 "VideoSupport.c"
+#line 9706 "VideoSupport.c"
 }
 
 
 void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9558 "VideoSupport.c"
+#line 9726 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9562 "VideoSupport.c"
+#line 9730 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9568 "VideoSupport.c"
+#line 9736 "VideoSupport.c"
 	}
 }
 
 
 void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9587 "VideoSupport.c"
+#line 9755 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9591 "VideoSupport.c"
+#line 9759 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9597 "VideoSupport.c"
+#line 9765 "VideoSupport.c"
 	}
 }
 
 
 static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9607 "VideoSupport.c"
+#line 9775 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_instance_init (VideoInterpretableResults * self) {
-#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->update_interpretable = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->is_interpretable = FALSE;
-#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->new_thumbnail = NULL;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9620 "VideoSupport.c"
+#line 9788 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_finalize (VideoInterpretableResults* obj) {
 	VideoInterpretableResults * self;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9634 "VideoSupport.c"
+#line 9802 "VideoSupport.c"
 }
 
 
@@ -9655,172 +9823,172 @@ GType video_interpretable_results_get_type (void) {
 gpointer video_interpretable_results_ref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9659 "VideoSupport.c"
+#line 9827 "VideoSupport.c"
 }
 
 
 void video_interpretable_results_unref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9672 "VideoSupport.c"
+#line 9840 "VideoSupport.c"
 	}
 }
 
 
 static void video_class_init (VideoClass * klass) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_parent_class = g_type_class_peek_parent (klass);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoPrivate));
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->commit_backlinks = video_real_commit_backlinks;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_event_id = video_real_set_event_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_backing_files_state = video_real_get_backing_files_state;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = video_real_get_thumbnail;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_md5 = video_real_get_master_md5;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = video_real_get_preview_pixbuf;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->create_thumbnail = video_real_create_thumbnail;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_typename = video_real_get_typename;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_instance_id = video_real_get_instance_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_import_id = video_real_get_import_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_real_get_preferred_thumbnail_format;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_title = video_real_get_title;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_title = video_real_set_title;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_comment = video_real_get_comment;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_comment = video_real_set_comment;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_rating = video_real_get_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_rating = video_real_set_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->increase_rating = video_real_increase_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->decrease_rating = video_real_decrease_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_trashed = video_real_is_trashed;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_offline = video_real_is_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_offline = video_real_mark_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_online = video_real_mark_online;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->trash = video_real_trash;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->untrash = video_real_untrash;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_event_id = video_real_get_event_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataObjectClass *) klass)->to_string = video_real_to_string;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_exposure_time = video_real_get_exposure_time;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_dimensions = video_real_get_dimensions;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_filesize = video_real_get_filesize;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_filesize = video_real_get_master_filesize;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_timestamp = video_real_get_timestamp;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_file = video_real_get_file;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_file = video_real_get_master_file;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->destroy = video_real_destroy;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = video_real_internal_delete_backing;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9756 "VideoSupport.c"
+#line 9924 "VideoSupport.c"
 }
 
 
 static void video_flaggable_interface_init (FlaggableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_flagged = (gboolean (*)(Flaggable*)) video_real_is_flagged;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_flagged = (void (*)(Flaggable*)) video_real_mark_flagged;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) video_real_mark_unflagged;
-#line 9769 "VideoSupport.c"
+#line 9937 "VideoSupport.c"
 }
 
 
 static void video_monitorable_interface_init (MonitorableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_offline = (gboolean (*)(Monitorable*)) video_real_is_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_offline = (void (*)(Monitorable*)) video_real_mark_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_online = (void (*)(Monitorable*)) video_real_mark_online;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) video_real_set_master_timestamp;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) video_real_set_master_file;
-#line 9786 "VideoSupport.c"
+#line 9954 "VideoSupport.c"
 }
 
 
 static void video_dateable_interface_init (DateableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_dateable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->get_exposure_time = (time_t (*)(Dateable*)) video_real_get_exposure_time;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*)(Dateable*, time_t)) video_real_set_exposure_time;
-#line 9797 "VideoSupport.c"
+#line 9965 "VideoSupport.c"
 }
 
 
 static void video_instance_init (Video * self) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_GET_PRIVATE (self);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9806 "VideoSupport.c"
+#line 9974 "VideoSupport.c"
 }
 
 
 static void video_finalize (GObject* obj) {
 	Video * self;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_clear (&self->priv->__lock_backing_row);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9820 "VideoSupport.c"
+#line 9988 "VideoSupport.c"
 }
 
 
@@ -9857,44 +10025,44 @@ GType video_source_collection_state_get_type (void) {
 static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = uint64_compare ((guint64*) a, (guint64*) b);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9859 "VideoSupport.c"
+#line 10027 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 9871 "VideoSupport.c"
+#line 10039 "VideoSupport.c"
 }
 
 
 static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = video_source_collection_get_video_key (source);
-#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9880 "VideoSupport.c"
+#line 10048 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9887 "VideoSupport.c"
+#line 10055 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9894 "VideoSupport.c"
+#line 10062 "VideoSupport.c"
 }
 
 
@@ -9904,43 +10072,43 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoSourceCollection*) media_source_collection_construct (object_type, "VideoSourceCollection", _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9924 "VideoSupport.c"
+#line 10092 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 9931 "VideoSupport.c"
+#line 10099 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_trashed (source);
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9940 "VideoSupport.c"
+#line 10108 "VideoSupport.c"
 }
 
 
@@ -9948,24 +10116,24 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9956 "VideoSupport.c"
+#line 10124 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_offline (source);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9965 "VideoSupport.c"
+#line 10133 "VideoSupport.c"
 }
 
 
@@ -9973,15 +10141,15 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_offline_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9981 "VideoSupport.c"
+#line 10149 "VideoSupport.c"
 }
 
 
@@ -9990,21 +10158,21 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	MediaMonitor* result = NULL;
 	GCancellable* _tmp0_ = NULL;
 	VideoMonitor* _tmp1_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10004 "VideoSupport.c"
+#line 10172 "VideoSupport.c"
 }
 
 
@@ -10012,17 +10180,17 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10022 "VideoSupport.c"
+#line 10190 "VideoSupport.c"
 }
 
 
@@ -10030,15 +10198,15 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10038 "VideoSupport.c"
+#line 10206 "VideoSupport.c"
 }
 
 
@@ -10047,57 +10215,57 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10059 "VideoSupport.c"
+#line 10227 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10078 "VideoSupport.c"
+#line 10246 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10097 "VideoSupport.c"
+#line 10265 "VideoSupport.c"
 }
 
 
@@ -10107,19 +10275,19 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	gint64 _tmp0_ = 0LL;
 	VideoID _tmp1_ = {0};
 	Video* _tmp2_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10119 "VideoSupport.c"
+#line 10287 "VideoSupport.c"
 }
 
 
@@ -10132,29 +10300,29 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	VideoID _tmp2_ = {0};
 	VideoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = _tmp1_;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10154 "VideoSupport.c"
+#line 10322 "VideoSupport.c"
 }
 
 
@@ -10162,17 +10330,17 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10172 "VideoSupport.c"
+#line 10340 "VideoSupport.c"
 }
 
 
@@ -10180,17 +10348,17 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10190 "VideoSupport.c"
+#line 10358 "VideoSupport.c"
 }
 
 
@@ -10199,21 +10367,21 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10213 "VideoSupport.c"
+#line 10381 "VideoSupport.c"
 }
 
 
@@ -10225,27 +10393,27 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10245 "VideoSupport.c"
+#line 10413 "VideoSupport.c"
 }
 
 
@@ -10266,113 +10434,113 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	GFile* _tmp10_ = NULL;
 	MediaSource* _tmp11_ = NULL;
 	Video* _tmp12_ = NULL;
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ != NULL) {
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10288 "VideoSupport.c"
+#line 10456 "VideoSupport.c"
 		}
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10292 "VideoSupport.c"
+#line 10460 "VideoSupport.c"
 	}
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10320 "VideoSupport.c"
+#line 10488 "VideoSupport.c"
 		}
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10324 "VideoSupport.c"
+#line 10492 "VideoSupport.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp9_);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp12_ != NULL) {
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10352 "VideoSupport.c"
+#line 10520 "VideoSupport.c"
 		}
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10356 "VideoSupport.c"
+#line 10524 "VideoSupport.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10368 "VideoSupport.c"
+#line 10536 "VideoSupport.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10372 "VideoSupport.c"
+#line 10540 "VideoSupport.c"
 }
 
 
@@ -10386,83 +10554,83 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	GFileInfo* _tmp6_ = NULL;
 	GTimeVal _tmp7_ = {0};
 	glong _tmp8_ = 0L;
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != ((guint64) _tmp3_)) {
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10406 "VideoSupport.c"
+#line 10574 "VideoSupport.c"
 	}
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10420 "VideoSupport.c"
+#line 10588 "VideoSupport.c"
 		GeeCollection* _tmp9_ = NULL;
 		Video* _tmp10_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10429 "VideoSupport.c"
+#line 10597 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10441 "VideoSupport.c"
+#line 10609 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10462 "VideoSupport.c"
+#line 10630 "VideoSupport.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			DataObject* object = NULL;
@@ -10471,37 +10639,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			DataObject* _tmp8_ = NULL;
 			GFileInfo* _tmp9_ = NULL;
 			GeeCollection* _tmp10_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10479 "VideoSupport.c"
+#line 10647 "VideoSupport.c"
 			}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			object = (DataObject*) _tmp7_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10497 "VideoSupport.c"
+#line 10665 "VideoSupport.c"
 		}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10501 "VideoSupport.c"
+#line 10669 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10509,21 +10677,21 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		GeeCollection* _tmp12_ = NULL;
 		GeeIterator* _tmp13_ = NULL;
 		GeeIterator* _tmp14_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10523 "VideoSupport.c"
+#line 10691 "VideoSupport.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			MediaSource* media = NULL;
@@ -10532,37 +10700,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			MediaSource* _tmp19_ = NULL;
 			GFileInfo* _tmp20_ = NULL;
 			GeeCollection* _tmp21_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10540 "VideoSupport.c"
+#line 10708 "VideoSupport.c"
 			}
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media = (MediaSource*) _tmp18_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10558 "VideoSupport.c"
+#line 10726 "VideoSupport.c"
 		}
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10562 "VideoSupport.c"
+#line 10730 "VideoSupport.c"
 	}
 }
 
@@ -10573,30 +10741,30 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	GeeIterable* _tmp13_ = NULL;
 	GeeIterable* _tmp26_ = NULL;
 	GeeIterable* _tmp27_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10583 "VideoSupport.c"
+#line 10751 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10596 "VideoSupport.c"
+#line 10764 "VideoSupport.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -10609,67 +10777,67 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp10_ = NULL;
 				guint64 _tmp11_ = 0ULL;
 				Video* _tmp12_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10617 "VideoSupport.c"
+#line 10785 "VideoSupport.c"
 				}
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp6_;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10645 "VideoSupport.c"
+#line 10813 "VideoSupport.c"
 			}
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10649 "VideoSupport.c"
+#line 10817 "VideoSupport.c"
 		}
 	}
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10656 "VideoSupport.c"
+#line 10824 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_ = NULL;
 			GeeIterator* _tmp15_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10669 "VideoSupport.c"
+#line 10837 "VideoSupport.c"
 				GeeIterator* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
 				DataObject* object = NULL;
@@ -10682,66 +10850,66 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp23_ = NULL;
 				guint64 _tmp24_ = 0ULL;
 				Video* _tmp25_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10690 "VideoSupport.c"
+#line 10858 "VideoSupport.c"
 				}
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp19_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10718 "VideoSupport.c"
+#line 10886 "VideoSupport.c"
 			}
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10722 "VideoSupport.c"
+#line 10890 "VideoSupport.c"
 		}
 	}
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_);
-#line 10731 "VideoSupport.c"
+#line 10899 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10741 "VideoSupport.c"
+#line 10909 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -10750,25 +10918,25 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10768 "VideoSupport.c"
+#line 10936 "VideoSupport.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Video* video = NULL;
@@ -10781,72 +10949,72 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10789 "VideoSupport.c"
+#line 10957 "VideoSupport.c"
 			}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video = (Video*) _tmp9_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10815 "VideoSupport.c"
+#line 10983 "VideoSupport.c"
 				Video* _tmp17_ = NULL;
 				VideoID _tmp18_ = {0};
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10830 "VideoSupport.c"
+#line 10998 "VideoSupport.c"
 			}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10834 "VideoSupport.c"
+#line 11002 "VideoSupport.c"
 		}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10838 "VideoSupport.c"
+#line 11006 "VideoSupport.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10846 "VideoSupport.c"
+#line 11014 "VideoSupport.c"
 }
 
 
@@ -10856,23 +11024,23 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	guint64 _tmp1_ = 0ULL;
 	VideoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10872 "VideoSupport.c"
+#line 11040 "VideoSupport.c"
 }
 
 
@@ -10881,88 +11049,88 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 10887 "VideoSupport.c"
+#line 11055 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 10895 "VideoSupport.c"
+#line 11063 "VideoSupport.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10903 "VideoSupport.c"
+#line 11071 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = video_source_collection_real_create_trashcan;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = video_source_collection_real_create_offline_bin;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = video_source_collection_real_create_media_monitor;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = video_source_collection_real_holds_type_of_source;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = video_source_collection_real_get_typename;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = video_source_collection_real_is_file_recognized;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = video_source_collection_real_fetch_by_numeric_id;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = video_source_collection_real_get_event_source_ids;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = video_source_collection_real_notify_contents_altered;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 10934 "VideoSupport.c"
+#line 11102 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
 	GeeTreeMultiMap* _tmp0_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 10948 "VideoSupport.c"
+#line 11116 "VideoSupport.c"
 }
 
 
 static void video_source_collection_finalize (DataCollection* obj) {
 	VideoSourceCollection * self;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 10962 "VideoSupport.c"
+#line 11130 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 540aad4..5076a31 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -53,9 +53,24 @@ public class VideoReader {
      }
     
     public static bool is_supported_video_file(File file) {
+        var mime_type = ContentType.guess(file.get_basename(), new uchar[0], null);
+        // special case: deep-check content-type of files ending with .ogg
+        if (mime_type == "audio/ogg" && file.has_uri_scheme("file")) {
+            try {
+                var info = file.query_info(FileAttribute.STANDARD_CONTENT_TYPE,
+                                           FileQueryInfoFlags.NONE);
+                var content_type = info.get_content_type();
+                if (content_type != null && content_type.has_prefix ("video/")) {
+                    return true;
+                }
+            } catch (Error error) {
+                debug("Failed to query content type: %s", error.message);
+            }
+        }
+
         return is_supported_video_filename(file.get_basename());
     }
-    
+
     public static bool is_supported_video_filename(string filename) {
         string mime_type;
         mime_type = ContentType.guess(filename, new uchar[0], null);
@@ -63,7 +78,7 @@ public class VideoReader {
             string? extension = null;
             string? name = null;
             disassemble_filename(filename, out name, out extension);
-            
+
             if (extension == null)
                 return true;
 
@@ -71,9 +86,10 @@ public class VideoReader {
                 if (utf8_ci_compare(s, extension) == 0)
                     return false;
             }
-                
+
             return true;
         } else {
+            debug("Skipping %s, unsupported mime type %s", filename, mime_type);
             return false;
         }
     }
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 926608c..33dc872 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -672,7 +672,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 675 "CameraTable.c"
-				goto __catch56_gphoto_error;
+				goto __catch57_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -683,8 +683,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 684 "CameraTable.c"
 		}
 	}
-	goto __finally56;
-	__catch56_gphoto_error:
+	goto __finally57;
+	__catch57_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -707,7 +707,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		return result;
 #line 709 "CameraTable.c"
 	}
-	__finally56:
+	__finally57:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -726,7 +726,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 729 "CameraTable.c"
-				goto __catch57_gphoto_error;
+				goto __catch58_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -737,8 +737,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 738 "CameraTable.c"
 		}
 	}
-	goto __finally57;
-	__catch57_gphoto_error:
+	goto __finally58;
+	__catch58_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -757,7 +757,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		_g_error_free0 (err);
 #line 759 "CameraTable.c"
 	}
-	__finally57:
+	__finally58:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1747,7 +1747,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1748 "CameraTable.c"
-				goto __catch58_g_regex_error;
+				goto __catch59_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -1772,7 +1772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1773 "CameraTable.c"
-				goto __catch58_g_regex_error;
+				goto __catch59_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1798,8 +1798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1798 "CameraTable.c"
 	}
-	goto __finally58;
-	__catch58_g_regex_error:
+	goto __finally59;
+	__catch59_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1812,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
-	__finally58:
+	__finally59:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4170,7 +4170,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 4171 "CameraTable.c"
-				goto __catch59_gphoto_error;
+				goto __catch60_gphoto_error;
 			}
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4181,8 +4181,8 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 4180 "CameraTable.c"
 		}
 	}
-	goto __finally59;
-	__catch59_gphoto_error:
+	goto __finally60;
+	__catch60_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -4201,7 +4201,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		_g_error_free0 (err);
 #line 4201 "CameraTable.c"
 	}
-	__finally59:
+	__finally60:
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index b21ac78..41e795c 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -23,6 +23,10 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gphoto2/gphoto2-file.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -236,28 +240,28 @@ GQuark gphoto_error_quark (void) {
 static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 240 "GPhoto.c"
+#line 244 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
 #line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 247 "GPhoto.c"
+#line 251 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
 #line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 254 "GPhoto.c"
+#line 258 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 261 "GPhoto.c"
+#line 265 "GPhoto.c"
 }
 
 
@@ -266,21 +270,21 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
 	result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 270 "GPhoto.c"
+#line 274 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 277 "GPhoto.c"
+#line 281 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 284 "GPhoto.c"
+#line 288 "GPhoto.c"
 }
 
 
@@ -315,14 +319,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 319 "GPhoto.c"
+#line 323 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_new (void) {
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 326 "GPhoto.c"
+#line 330 "GPhoto.c"
 }
 
 
@@ -335,14 +339,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 339 "GPhoto.c"
+#line 343 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 346 "GPhoto.c"
+#line 350 "GPhoto.c"
 }
 
 
@@ -351,14 +355,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 355 "GPhoto.c"
+#line 359 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 362 "GPhoto.c"
+#line 366 "GPhoto.c"
 }
 
 
@@ -367,14 +371,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 371 "GPhoto.c"
+#line 375 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 378 "GPhoto.c"
+#line 382 "GPhoto.c"
 }
 
 
@@ -383,14 +387,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 387 "GPhoto.c"
+#line 391 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 394 "GPhoto.c"
+#line 398 "GPhoto.c"
 }
 
 
@@ -399,7 +403,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 403 "GPhoto.c"
+#line 407 "GPhoto.c"
 }
 
 
@@ -412,7 +416,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 416 "GPhoto.c"
+#line 420 "GPhoto.c"
 }
 
 
@@ -425,7 +429,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 429 "GPhoto.c"
+#line 433 "GPhoto.c"
 }
 
 
@@ -436,7 +440,7 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
 	g_return_if_fail (context != NULL);
 #line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_idle (self);
-#line 440 "GPhoto.c"
+#line 444 "GPhoto.c"
 }
 
 
@@ -452,7 +456,7 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
 	_tmp0_ = text;
 #line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 456 "GPhoto.c"
+#line 460 "GPhoto.c"
 }
 
 
@@ -468,7 +472,7 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
 	_tmp0_ = text;
 #line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 472 "GPhoto.c"
+#line 476 "GPhoto.c"
 }
 
 
@@ -484,7 +488,7 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
 	_tmp0_ = text;
 #line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 488 "GPhoto.c"
+#line 492 "GPhoto.c"
 }
 
 
@@ -508,7 +512,7 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
 	result = (guint) 0;
 #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 512 "GPhoto.c"
+#line 516 "GPhoto.c"
 }
 
 
@@ -522,7 +526,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
 	_tmp0_ = current;
 #line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 526 "GPhoto.c"
+#line 530 "GPhoto.c"
 }
 
 
@@ -533,14 +537,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
 	g_return_if_fail (context != NULL);
 #line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_stop (self);
-#line 537 "GPhoto.c"
+#line 541 "GPhoto.c"
 }
 
 
 static void gp_value_context_wrapper_init (GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	value->data[0].v_pointer = NULL;
-#line 544 "GPhoto.c"
+#line 548 "GPhoto.c"
 }
 
 
@@ -549,7 +553,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 553 "GPhoto.c"
+#line 557 "GPhoto.c"
 	}
 }
 
@@ -559,11 +563,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 563 "GPhoto.c"
+#line 567 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 567 "GPhoto.c"
+#line 571 "GPhoto.c"
 	}
 }
 
@@ -571,37 +575,37 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 575 "GPhoto.c"
+#line 579 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (collect_values[0].v_pointer) {
-#line 582 "GPhoto.c"
+#line 586 "GPhoto.c"
 		GPContextWrapper* object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 589 "GPhoto.c"
+#line 593 "GPhoto.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 593 "GPhoto.c"
+#line 597 "GPhoto.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 597 "GPhoto.c"
+#line 601 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 601 "GPhoto.c"
+#line 605 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 605 "GPhoto.c"
+#line 609 "GPhoto.c"
 }
 
 
@@ -612,25 +616,25 @@ static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 616 "GPhoto.c"
+#line 620 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = NULL;
-#line 622 "GPhoto.c"
+#line 626 "GPhoto.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = value->data[0].v_pointer;
-#line 626 "GPhoto.c"
+#line 630 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 630 "GPhoto.c"
+#line 634 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 634 "GPhoto.c"
+#line 638 "GPhoto.c"
 }
 
 
@@ -644,7 +648,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return G_PARAM_SPEC (spec);
-#line 648 "GPhoto.c"
+#line 652 "GPhoto.c"
 }
 
 
@@ -653,7 +657,7 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 657 "GPhoto.c"
+#line 661 "GPhoto.c"
 }
 
 
@@ -673,17 +677,17 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 677 "GPhoto.c"
+#line 681 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 681 "GPhoto.c"
+#line 685 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 687 "GPhoto.c"
+#line 691 "GPhoto.c"
 	}
 }
 
@@ -702,17 +706,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = v_object;
-#line 706 "GPhoto.c"
+#line 710 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 710 "GPhoto.c"
+#line 714 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 716 "GPhoto.c"
+#line 720 "GPhoto.c"
 	}
 }
 
@@ -736,7 +740,7 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->progress_update = gp_context_wrapper_real_progress_update;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_stop = gp_context_wrapper_real_progress_stop;
-#line 740 "GPhoto.c"
+#line 744 "GPhoto.c"
 }
 
 
@@ -748,7 +752,7 @@ static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
 	self->context = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->ref_count = 1;
-#line 752 "GPhoto.c"
+#line 756 "GPhoto.c"
 }
 
 
@@ -760,7 +764,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
 	g_signal_handlers_destroy (self);
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_context_unref0 (self->context);
-#line 764 "GPhoto.c"
+#line 768 "GPhoto.c"
 }
 
 
@@ -785,7 +789,7 @@ gpointer gp_context_wrapper_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return instance;
-#line 789 "GPhoto.c"
+#line 793 "GPhoto.c"
 }
 
 
@@ -798,7 +802,7 @@ void gp_context_wrapper_unref (gpointer instance) {
 		GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 802 "GPhoto.c"
+#line 806 "GPhoto.c"
 	}
 }
 
@@ -809,14 +813,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
 	self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 813 "GPhoto.c"
+#line 817 "GPhoto.c"
 }
 
 
 GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 820 "GPhoto.c"
+#line 824 "GPhoto.c"
 }
 
 
@@ -828,7 +832,7 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
 #line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 832 "GPhoto.c"
+#line 836 "GPhoto.c"
 }
 
 
@@ -846,7 +850,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
 #line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 850 "GPhoto.c"
+#line 854 "GPhoto.c"
 }
 
 
@@ -857,7 +861,7 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->idle = gp_spin_idle_wrapper_real_idle;
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_update = gp_spin_idle_wrapper_real_progress_update;
-#line 861 "GPhoto.c"
+#line 865 "GPhoto.c"
 }
 
 
@@ -911,7 +915,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = TRUE;
-#line 915 "GPhoto.c"
+#line 919 "GPhoto.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -924,11 +928,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		_tmp6_ = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 928 "GPhoto.c"
+#line 932 "GPhoto.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp0_) {
-#line 932 "GPhoto.c"
+#line 936 "GPhoto.c"
 		CameraFileInfo _tmp7_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
@@ -940,15 +944,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		if (info) {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*info = _vala_info;
-#line 944 "GPhoto.c"
+#line 948 "GPhoto.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			 (_vala_info);
-#line 948 "GPhoto.c"
+#line 952 "GPhoto.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 952 "GPhoto.c"
+#line 956 "GPhoto.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = camera;
@@ -970,7 +974,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	_tmp14_ = res;
 #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 974 "GPhoto.c"
+#line 978 "GPhoto.c"
 		int _tmp15_ = 0;
 		const gchar* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -995,7 +999,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return FALSE;
-#line 999 "GPhoto.c"
+#line 1003 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -1003,15 +1007,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (info) {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*info = _vala_info;
-#line 1007 "GPhoto.c"
+#line 1011 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1011 "GPhoto.c"
+#line 1015 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1015 "GPhoto.c"
+#line 1019 "GPhoto.c"
 }
 
 
@@ -1044,7 +1048,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1048 "GPhoto.c"
+#line 1052 "GPhoto.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1053,13 +1057,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1057 "GPhoto.c"
+#line 1061 "GPhoto.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1063 "GPhoto.c"
+#line 1067 "GPhoto.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1068,13 +1072,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1072 "GPhoto.c"
+#line 1076 "GPhoto.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1078 "GPhoto.c"
+#line 1082 "GPhoto.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1083,11 +1087,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1087 "GPhoto.c"
+#line 1091 "GPhoto.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1091 "GPhoto.c"
+#line 1095 "GPhoto.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1095,7 +1099,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1099 "GPhoto.c"
+#line 1103 "GPhoto.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1104,11 +1108,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1108 "GPhoto.c"
+#line 1112 "GPhoto.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1112 "GPhoto.c"
+#line 1116 "GPhoto.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -1130,7 +1134,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1134 "GPhoto.c"
+#line 1138 "GPhoto.c"
 }
 
 
@@ -1200,7 +1204,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
 #line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp9_) {
-#line 1204 "GPhoto.c"
+#line 1208 "GPhoto.c"
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
@@ -1226,7 +1230,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (path);
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		path = _tmp16_;
-#line 1230 "GPhoto.c"
+#line 1234 "GPhoto.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
@@ -1238,13 +1242,13 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		 (port_info);
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1242 "GPhoto.c"
+#line 1246 "GPhoto.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = photo_metadata_new ();
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp17_;
-#line 1248 "GPhoto.c"
+#line 1252 "GPhoto.c"
 	{
 		PhotoMetadata* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -1294,12 +1298,12 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (_tmp22_);
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1298 "GPhoto.c"
-			goto __catch60_g_error;
+#line 1302 "GPhoto.c"
+			goto __catch61_g_error;
 		}
 	}
-	goto __finally60;
-	__catch60_g_error:
+	goto __finally61;
+	__catch61_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1309,9 +1313,9 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_media_metadata_unref0 (metadata);
 #line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		metadata = NULL;
-#line 1313 "GPhoto.c"
+#line 1317 "GPhoto.c"
 	}
-	__finally60:
+	__finally61:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1328,7 +1332,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		g_clear_error (&_inner_error_);
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1332 "GPhoto.c"
+#line 1336 "GPhoto.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -1340,14 +1344,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	 (port_info);
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1344 "GPhoto.c"
+#line 1348 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup23 (guint8* self, int length) {
 #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1351 "GPhoto.c"
+#line 1355 "GPhoto.c"
 }
 
 
@@ -1388,7 +1392,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_vala_raw_length1 = 0;
 #line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) 0;
-#line 1392 "GPhoto.c"
+#line 1396 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -1419,8 +1423,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		__tmp0__size_ = _tmp0__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1423 "GPhoto.c"
-			goto __catch61_g_error;
+#line 1427 "GPhoto.c"
+			goto __catch62_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1438,10 +1442,10 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_vala_raw_length1 = _tmp7__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1442 "GPhoto.c"
+#line 1446 "GPhoto.c"
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally62;
+	__catch62_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
 		Camera* _tmp8_ = NULL;
@@ -1493,27 +1497,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1497 "GPhoto.c"
+#line 1501 "GPhoto.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1501 "GPhoto.c"
+#line 1505 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1507 "GPhoto.c"
+#line 1511 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1513 "GPhoto.c"
+#line 1517 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1517 "GPhoto.c"
+#line 1521 "GPhoto.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = metadata;
@@ -1529,27 +1533,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1533 "GPhoto.c"
+#line 1537 "GPhoto.c"
 			} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1537 "GPhoto.c"
+#line 1541 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length1) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length1 = _vala_raw_length1;
-#line 1543 "GPhoto.c"
+#line 1547 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			if (raw_length) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw_length = _vala_raw_length;
-#line 1549 "GPhoto.c"
+#line 1553 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1553 "GPhoto.c"
+#line 1557 "GPhoto.c"
 		}
 #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
@@ -1577,8 +1581,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_photo_preview_unref0 (preview);
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 1581 "GPhoto.c"
-			goto __finally61;
+#line 1585 "GPhoto.c"
+			goto __finally62;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1600,16 +1604,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_photo_preview_unref0 (preview);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 1604 "GPhoto.c"
+#line 1608 "GPhoto.c"
 	}
-	__finally61:
+	__finally62:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1613 "GPhoto.c"
+#line 1617 "GPhoto.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = _vala_raw;
@@ -1625,27 +1629,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		if (raw) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw = _vala_raw;
-#line 1629 "GPhoto.c"
+#line 1633 "GPhoto.c"
 		} else {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_vala_raw = (g_free (_vala_raw), NULL);
-#line 1633 "GPhoto.c"
+#line 1637 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length1) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length1 = _vala_raw_length1;
-#line 1639 "GPhoto.c"
+#line 1643 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (raw_length) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw_length = _vala_raw_length;
-#line 1645 "GPhoto.c"
+#line 1649 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1649 "GPhoto.c"
+#line 1653 "GPhoto.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = _vala_raw;
@@ -1657,7 +1661,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_tmp27_ = _vala_raw_length;
 #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp27_ > ((gsize) 32)) {
-#line 1661 "GPhoto.c"
+#line 1665 "GPhoto.c"
 		{
 			gsize i = 0UL;
 			gsize _tmp28_ = 0UL;
@@ -1665,14 +1669,14 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_tmp28_ = _vala_raw_length;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			i = _tmp28_ - 2;
-#line 1669 "GPhoto.c"
+#line 1673 "GPhoto.c"
 			{
 				gboolean _tmp29_ = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_tmp29_ = TRUE;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				while (TRUE) {
-#line 1676 "GPhoto.c"
+#line 1680 "GPhoto.c"
 					gsize _tmp31_ = 0UL;
 					gsize _tmp32_ = 0UL;
 					gboolean _tmp33_ = FALSE;
@@ -1682,13 +1686,13 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					guint8 _tmp36_ = 0U;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (!_tmp29_) {
-#line 1686 "GPhoto.c"
+#line 1690 "GPhoto.c"
 						gsize _tmp30_ = 0UL;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp30_ = i;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						i = _tmp30_ - 1;
-#line 1692 "GPhoto.c"
+#line 1696 "GPhoto.c"
 					}
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp29_ = FALSE;
@@ -1700,7 +1704,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					if (!(_tmp31_ > (_tmp32_ - 32))) {
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1704 "GPhoto.c"
+#line 1708 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp34_ = _vala_raw;
@@ -1712,7 +1716,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					_tmp36_ = _tmp34_[_tmp35_];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1716 "GPhoto.c"
+#line 1720 "GPhoto.c"
 						guint8* _tmp37_ = NULL;
 						gint _tmp37__length1 = 0;
 						gsize _tmp38_ = 0UL;
@@ -1727,15 +1731,15 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_tmp39_ = _tmp37_[_tmp38_ + 1];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1731 "GPhoto.c"
+#line 1735 "GPhoto.c"
 					} else {
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = FALSE;
-#line 1735 "GPhoto.c"
+#line 1739 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp33_) {
-#line 1739 "GPhoto.c"
+#line 1743 "GPhoto.c"
 						const gchar* _tmp40_ = NULL;
 						gsize _tmp41_ = 0UL;
 #line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1748,7 +1752,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_vala_raw_length = _tmp41_ + 2;
 #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1752 "GPhoto.c"
+#line 1756 "GPhoto.c"
 					}
 				}
 			}
@@ -1780,7 +1784,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_g_object_unref0 (mins);
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1784 "GPhoto.c"
+#line 1788 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp48_ = _tmp45_;
@@ -1796,27 +1800,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	if (raw) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw = _vala_raw;
-#line 1800 "GPhoto.c"
+#line 1804 "GPhoto.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1804 "GPhoto.c"
+#line 1808 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length1) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length1 = _vala_raw_length1;
-#line 1810 "GPhoto.c"
+#line 1814 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length = _vala_raw_length;
-#line 1816 "GPhoto.c"
+#line 1820 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1820 "GPhoto.c"
+#line 1824 "GPhoto.c"
 }
 
 
@@ -1860,7 +1864,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1864 "GPhoto.c"
+#line 1868 "GPhoto.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
@@ -1872,7 +1876,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1876 "GPhoto.c"
+#line 1880 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
@@ -1888,7 +1892,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1892 "GPhoto.c"
+#line 1896 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
@@ -1902,29 +1906,32 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 	_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1906 "GPhoto.c"
+#line 1910 "GPhoto.c"
 }
 
 
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
+	gint fd = 0;
+	GFile* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
 	CameraFile* camera_file = NULL;
 	int res = 0;
-	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFile* _tmp10_ = NULL;
-	GPContext* _tmp11_ = NULL;
-	int _tmp12_ = 0;
-	int _tmp13_ = 0;
-	CameraFile* _tmp20_ = NULL;
-	GFile* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	int _tmp24_ = 0;
-	int _tmp25_ = 0;
+	gint _tmp12_ = 0;
+	CameraFile* _tmp13_ = NULL;
+	int _tmp14_ = 0;
+	int _tmp15_ = 0;
+	Camera* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
+	const gchar* _tmp23_ = NULL;
+	CameraFile* _tmp24_ = NULL;
+	GPContext* _tmp25_ = NULL;
+	int _tmp26_ = 0;
+	int _tmp27_ = 0;
+	gint _tmp35_ = 0;
 	GError * _inner_error_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (context != NULL);
@@ -1936,152 +1943,154 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	g_return_if_fail (filename != NULL);
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp0_ = dest_file;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp1_ = g_file_get_path (_tmp0_);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp2_ = _tmp1_;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp3_ = creat (_tmp2_, (mode_t) 0640);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp4_ = _tmp3_;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_free0 (_tmp2_);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	fd = _tmp4_;
+#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp5_ = fd;
+#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp5_ < 0) {
+#line 1965 "GPhoto.c"
+		gint _tmp6_ = 0;
+		GFile* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		GError* _tmp10_ = NULL;
+		GError* _tmp11_ = NULL;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp1_ = gp_file_new (&_tmp0_);
+		_tmp6_ = errno;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_gp_file_unref0 (camera_file);
+		_tmp7_ = dest_file;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	camera_file = _tmp0_;
+		_tmp8_ = g_file_get_path (_tmp7_);
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp9_ = _tmp8_;
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp11_ = _tmp10_;
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_free0 (_tmp9_);
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp11_;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp1_;
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp2_ = res;
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp2_ != GP_OK) {
-#line 1952 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp3_ = res;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp4_ = res;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp6_;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_gp_file_unref0 (camera_file);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1973 "GPhoto.c"
+#line 1992 "GPhoto.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp7_ = camera;
+	_tmp12_ = fd;
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp8_ = folder;
+	_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp9_ = filename;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp10_ = camera_file;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp11_ = context;
+	_gp_file_unref0 (camera_file);
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, GP_FILE_TYPE_NORMAL, _tmp10_, _tmp11_);
+	camera_file = _tmp13_;
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp12_;
+	res = _tmp14_;
 #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp13_ = res;
+	_tmp15_ = res;
 #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp13_ != GP_OK) {
-#line 1993 "GPhoto.c"
-		int _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+	if (_tmp15_ != GP_OK) {
+#line 2008 "GPhoto.c"
+		gint _tmp16_ = 0;
 		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp14_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp15_ = folder;
+		int _tmp18_ = 0;
+		const gchar* _tmp19_ = NULL;
+		GError* _tmp20_ = NULL;
 #line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp16_ = filename;
+		_tmp16_ = fd;
 #line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		close (_tmp16_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp19_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp18_ = res;
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp19_ = gp_port_result_as_string (_tmp18_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp17_, _tmp19_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp20_;
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2020 "GPhoto.c"
+#line 2034 "GPhoto.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp20_ = camera_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp21_ = dest_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp22_ = g_file_get_path (_tmp21_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp23_ = _tmp22_;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp24_ = gp_file_save (_tmp20_, _tmp23_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp24_;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_free0 (_tmp23_);
 #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp25_ = res;
+	_tmp21_ = camera;
 #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp25_ != GP_OK) {
-#line 2040 "GPhoto.c"
-		int _tmp26_ = 0;
-		const gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
+	_tmp22_ = folder;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp23_ = filename;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp24_ = camera_file;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp25_ = context;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp26_ = gp_camera_file_get (_tmp21_, _tmp22_, _tmp23_, GP_FILE_TYPE_NORMAL, _tmp24_, _tmp25_);
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	res = _tmp26_;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = res;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp27_ != GP_OK) {
+#line 2054 "GPhoto.c"
+		gint _tmp28_ = 0;
+		int _tmp29_ = 0;
+		const gchar* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
 		int _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
 		GError* _tmp34_ = NULL;
-		GError* _tmp35_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp27_ = folder;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp28_ = filename;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp29_ = dest_file;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp31_ = _tmp30_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp28_ = fd;
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		close (_tmp28_);
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp29_ = res;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp30_ = folder;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp31_ = filename;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp32_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp33_ = gp_port_result_as_string (_tmp32_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp34_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp26_, _tmp27_, _tmp28_, _tmp31_, _tmp33_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp35_ = _tmp34_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_g_free0 (_tmp31_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp35_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp34_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp29_, _tmp30_, _tmp31_, _tmp33_);
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp34_;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2081 "GPhoto.c"
+#line 2086 "GPhoto.c"
 	}
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp35_ = fd;
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	close (_tmp35_);
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 2085 "GPhoto.c"
+#line 2094 "GPhoto.c"
 }
 
 
@@ -2099,21 +2108,21 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 	guint8* _tmp18_ = NULL;
 	gint _tmp18__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = NULL;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw_length1 = 0;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_camera_raw_size_ = camera_raw_length1;
-#line 2117 "GPhoto.c"
+#line 2126 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -2126,163 +2135,163 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		gint __tmp0__size_ = 0;
 		guint8* _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = _tmp5_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2148 "GPhoto.c"
-			goto __catch62_g_error;
+#line 2157 "GPhoto.c"
+			goto __catch63_g_error;
 		}
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7__length1 = _tmp0__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = _tmp7_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw_length1 = _tmp7__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_camera_raw_size_ = camera_raw_length1;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2169 "GPhoto.c"
+#line 2178 "GPhoto.c"
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		Camera* _tmp8_ = NULL;
 		GPContext* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		PhotoMetadata* _tmp12_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = camera;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = context;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = folder;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = filename;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp12_;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2199 "GPhoto.c"
+#line 2208 "GPhoto.c"
 	}
-	__finally62:
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally63:
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2210 "GPhoto.c"
+#line 2219 "GPhoto.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = camera_raw;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14__length1 = camera_raw_length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ == NULL) {
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = TRUE;
-#line 2220 "GPhoto.c"
+#line 2229 "GPhoto.c"
 	} else {
 		guint8* _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = camera_raw;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15__length1 = camera_raw_length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = _tmp15__length1 == 0;
-#line 2230 "GPhoto.c"
+#line 2239 "GPhoto.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_) {
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2240 "GPhoto.c"
+#line 2249 "GPhoto.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp16_ = photo_metadata_new ();
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp16_;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = metadata;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18_ = camera_raw;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18__length1 = camera_raw_length1;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2264 "GPhoto.c"
+#line 2273 "GPhoto.c"
 	}
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = (g_free (camera_raw), NULL);
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2272 "GPhoto.c"
+#line 2281 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 2279 "GPhoto.c"
+#line 2288 "GPhoto.c"
 }
 
 
 static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_on_mins_destroyed (data);
-#line 2286 "GPhoto.c"
+#line 2295 "GPhoto.c"
 }
 
 
@@ -2321,109 +2330,109 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	GFileInputStream* _tmp53_ = NULL;
 	GFileInputStream* _tmp54_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2345 "GPhoto.c"
+#line 2354 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2366 "GPhoto.c"
+#line 2375 "GPhoto.c"
 	}
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = context;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp12_;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = res;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2386 "GPhoto.c"
+#line 2395 "GPhoto.c"
 		int _tmp14_ = 0;
 		const gchar* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		int _tmp17_ = 0;
 		const gchar* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = folder;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = filename;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2413 "GPhoto.c"
+#line 2422 "GPhoto.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp20_;
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp21_;
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp22_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = res;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp23_ == GP_OK) {
-#line 2427 "GPhoto.c"
+#line 2436 "GPhoto.c"
 		guint8* buffer = NULL;
 		gulong _tmp24_ = 0UL;
 		guint8* _tmp25_ = NULL;
@@ -2439,77 +2448,77 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		guint8* _tmp30_ = NULL;
 		gint _tmp30__length1 = 0;
 		GMemoryInputStream* _tmp31_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = data_len;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = _tmp25_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer_length1 = _tmp24_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_buffer_size_ = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = buffer;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = data;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = buffer;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28__length1 = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = buffer;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29__length1 = buffer_length1;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30__length1 = _tmp29__length1;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/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"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2483 "GPhoto.c"
+#line 2492 "GPhoto.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = app_dirs_get_temp_dir ();
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp33_ = _tmp32_;
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp35_ = _tmp34_;
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp33_);
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	temp = _tmp35_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp36_ = temp;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp37_ = g_file_get_path (_tmp36_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp38_ = _tmp37_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp39_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp38_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp40_ = res;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp40_ != GP_OK) {
-#line 2513 "GPhoto.c"
+#line 2522 "GPhoto.c"
 		int _tmp41_ = 0;
 		const gchar* _tmp42_ = NULL;
 		const gchar* _tmp43_ = NULL;
@@ -2520,83 +2529,83 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		const gchar* _tmp48_ = NULL;
 		GError* _tmp49_ = NULL;
 		GError* _tmp50_ = NULL;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp41_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp42_ = folder;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp43_ = filename;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp44_ = temp;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp46_ = _tmp45_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp47_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp50_ = _tmp49_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp46_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp50_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2556 "GPhoto.c"
+#line 2565 "GPhoto.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp52_ = temp;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = _tmp53_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2574 "GPhoto.c"
+#line 2583 "GPhoto.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp54_ = _tmp51_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (temp);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2590 "GPhoto.c"
+#line 2599 "GPhoto.c"
 }
 
 
 void gp_on_mins_destroyed (void* data) {
 	void* _tmp0_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = data;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_free (_tmp0_);
-#line 2600 "GPhoto.c"
+#line 2609 "GPhoto.c"
 }
 
 
@@ -2635,172 +2644,172 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	guint8* _tmp32_ = NULL;
 	gint _tmp32__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2659 "GPhoto.c"
+#line 2668 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2680 "GPhoto.c"
+#line 2689 "GPhoto.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = camera_file;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = context;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp13_;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = res;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2702 "GPhoto.c"
+#line 2711 "GPhoto.c"
 		int _tmp15_ = 0;
 		const gchar* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		int _tmp18_ = 0;
 		const gchar* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = folder;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = filename;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp20_;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2729 "GPhoto.c"
+#line 2738 "GPhoto.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera_file;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp22_;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp23_;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp24_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = res;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp25_ != GP_OK) {
-#line 2745 "GPhoto.c"
+#line 2754 "GPhoto.c"
 		guint8* _tmp26_ = NULL;
 		gint _tmp26__length1 = 0;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = 0;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (result_length1) {
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*result_length1 = _tmp26__length1;
-#line 2756 "GPhoto.c"
+#line 2765 "GPhoto.c"
 		}
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp26_;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2764 "GPhoto.c"
+#line 2773 "GPhoto.c"
 	}
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp27_ = data_len;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp28_ = g_new0 (guint8, _tmp27_);
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer = _tmp28_;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer_length1 = _tmp27_;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_buffer_size_ = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29_ = buffer;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29__length1 = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp30_ = data;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31_ = buffer;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31__length1 = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = buffer;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32__length1 = buffer_length1;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (result_length1) {
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*result_length1 = _tmp32__length1;
-#line 2796 "GPhoto.c"
+#line 2805 "GPhoto.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp32_;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2804 "GPhoto.c"
+#line 2813 "GPhoto.c"
 }
 
 
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 3616cb2..5acc4a3 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -196,22 +196,27 @@ namespace GPhoto {
         return new Gdk.Pixbuf.from_stream(ins, null);
     }
 
-    public void save_image(Context context, Camera camera, string folder, string filename, 
-        File dest_file) throws Error {
+    public void save_image(Context context, Camera camera, string folder, string filename, File dest_file) throws Error {
+        var fd = Posix.creat(dest_file.get_path(), 0640);
+        if (fd < 0) {
+            throw new IOError.FAILED("[%d] Error creating file %s: %m", GLib.errno, dest_file.get_path());
+        }
+
         GPhoto.CameraFile camera_file;
-        GPhoto.Result res = GPhoto.CameraFile.create(out camera_file);
-        if (res != Result.OK)
+        GPhoto.Result res = GPhoto.CameraFile.create_from_fd(out camera_file, fd);
+        if (res != Result.OK) {
+            Posix.close(fd);
             throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string());
+        }
         
         res = camera.get_file(folder, filename, GPhoto.CameraFileType.NORMAL, camera_file, context);
-        if (res != Result.OK)
+        if (res != Result.OK) {
+            Posix.close(fd);
             throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s", 
                 (int) res, folder, filename, res.as_string());
+        }
 
-        res = camera_file.save(dest_file.get_path());
-        if (res != Result.OK)
-            throw new GPhotoError.LIBRARY("[%d] Error copying file %s/%s to %s: %s", (int) res, 
-                folder, filename, dest_file.get_path(), res.as_string());
+        Posix.close(fd);
     }
     
     public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename)
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 5e7cfb2..f967876 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -2530,13 +2530,13 @@ static gchar* gp_result_to_full_string (int self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	_tmp0_ = gp_port_result_as_string (self);
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	_tmp1_ = g_strdup_printf ("%s (%d)", _tmp0_, (gint) self);
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	result = _tmp1_;
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	return result;
 #line 2541 "ImportPage.c"
 }
@@ -3916,7 +3916,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3918 "ImportPage.c"
-			goto __catch63_g_error;
+			goto __catch64_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3930,8 +3930,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp6_);
 #line 3931 "ImportPage.c"
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally64;
+	__catch64_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -3958,7 +3958,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_error_free0 (err);
 #line 3959 "ImportPage.c"
 	}
-	__finally63:
+	__finally64:
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6845,7 +6845,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6847 "ImportPage.c"
-					goto __catch64_g_error;
+					goto __catch65_g_error;
 				}
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
@@ -6859,8 +6859,8 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_object_unref0 (_tmp9_);
 #line 6860 "ImportPage.c"
 			}
-			goto __finally64;
-			__catch64_g_error:
+			goto __finally65;
+			__catch65_g_error:
 			{
 				GError* err = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6871,7 +6871,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_error_free0 (err);
 #line 6872 "ImportPage.c"
 			}
-			__finally64:
+			__finally65:
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7208,11 +7208,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7207 "ImportPage.c"
-			goto __catch65_g_error;
+			goto __catch66_g_error;
 		}
 	}
-	goto __finally65;
-	__catch65_g_error:
+	goto __finally66;
+	__catch66_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_ = 0U;
@@ -7250,7 +7250,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		_g_error_free0 (err);
 #line 7248 "ImportPage.c"
 	}
-	__finally65:
+	__finally66:
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8913,7 +8913,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
 #line 8912 "ImportPage.c"
-						goto __catch66_g_error;
+						goto __catch67_g_error;
 					}
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
@@ -9149,8 +9149,8 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					 (info);
 #line 9146 "ImportPage.c"
 				}
-				goto __finally66;
-				__catch66_g_error:
+				goto __finally67;
+				__catch67_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp103_ = NULL;
@@ -9195,7 +9195,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					return result;
 #line 9192 "ImportPage.c"
 				}
-				__finally66:
+				__finally67:
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10169,7 +10169,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10166 "ImportPage.c"
-						goto __catch67_g_error;
+						goto __catch68_g_error;
 					}
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = _tmp36_;
@@ -10183,8 +10183,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (_tmp36_);
 #line 10179 "ImportPage.c"
 				}
-				goto __finally67;
-				__catch67_g_error:
+				goto __finally68;
+				__catch68_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -10209,7 +10209,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10205 "ImportPage.c"
 				}
-				__finally67:
+				__finally68:
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10408,7 +10408,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
 #line 10405 "ImportPage.c"
-					goto __catch68_g_error;
+					goto __catch69_g_error;
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp77_ = _tmp67_;
@@ -10426,8 +10426,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_fulldir);
 #line 10422 "ImportPage.c"
 			}
-			goto __finally68;
-			__catch68_g_error:
+			goto __finally69;
+			__catch69_g_error:
 			{
 				GError* err = NULL;
 				const gchar* _tmp78_ = NULL;
@@ -10463,7 +10463,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_error_free0 (err);
 #line 10459 "ImportPage.c"
 			}
-			__finally68:
+			__finally69:
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10640,7 +10640,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10637 "ImportPage.c"
-						goto __catch69_g_error;
+						goto __catch70_g_error;
 					}
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp113_ = associated;
@@ -10656,8 +10656,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (associated_metadata);
 #line 10652 "ImportPage.c"
 				}
-				goto __finally69;
-				__catch69_g_error:
+				goto __finally70;
+				__catch70_g_error:
 				{
 					GError* err = NULL;
 					PhotoImportSource* _tmp117_ = NULL;
@@ -10698,7 +10698,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10694 "ImportPage.c"
 				}
-				__finally69:
+				__finally70:
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11385,11 +11385,11 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11381 "ImportPage.c"
-			goto __catch70_g_error;
+			goto __catch71_g_error;
 		}
 	}
-	goto __finally70;
-	__catch70_g_error:
+	goto __finally71;
+	__catch71_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_ = NULL;
@@ -11422,7 +11422,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_g_error_free0 (err);
 #line 11417 "ImportPage.c"
 	}
-	__finally70:
+	__finally71:
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12521,7 +12521,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12517 "ImportPage.c"
-			goto __catch71_g_error;
+			goto __catch72_g_error;
 		}
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12535,8 +12535,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (_tmp0_);
 #line 12530 "ImportPage.c"
 	}
-	goto __finally71;
-	__catch71_g_error:
+	goto __finally72;
+	__catch72_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -12566,7 +12566,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_error_free0 (err);
 #line 12561 "ImportPage.c"
 	}
-	__finally71:
+	__finally72:
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12648,10 +12648,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12644 "ImportPage.c"
-			goto __finally72;
+			goto __finally73;
 		}
 	}
-	__finally72:
+	__finally73:
 	{
 		GFile* _tmp23_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12717,7 +12717,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12713 "ImportPage.c"
-				goto __catch73_g_error;
+				goto __catch74_g_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = _tmp25_;
@@ -12731,8 +12731,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_backing_photo_row_unref0 (_tmp25_);
 #line 12726 "ImportPage.c"
 		}
-		goto __finally73;
-		__catch73_g_error:
+		goto __finally74;
+		__catch74_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp35_ = NULL;
@@ -12758,7 +12758,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_error_free0 (err);
 #line 12752 "ImportPage.c"
 		}
-		__finally73:
+		__finally74:
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12849,10 +12849,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12844 "ImportPage.c"
-				goto __finally74;
+				goto __finally75;
 			}
 		}
-		__finally74:
+		__finally75:
 		{
 			GFile* _tmp54_ = NULL;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 09a6eb1..a44fd05 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -55,6 +55,8 @@ typedef struct _Dimensions Dimensions;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
+
 typedef enum  {
 	CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE,
 	CONFIGURATION_ERROR_ENGINE_ERROR
@@ -353,6 +355,12 @@ struct _ConfigurationFacadePrivate {
 	ConfigurationEngine* engine;
 };
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 
 static gpointer configuration_facade_parent_class = NULL;
 
@@ -609,6 +617,8 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self,
 static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles);
 gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self);
 static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code);
 static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, gint size_code);
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self);
@@ -702,7 +712,7 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 	switch (self) {
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 706 "ConfigurationInterfaces.c"
+#line 716 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -711,11 +721,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 715 "ConfigurationInterfaces.c"
+#line 725 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 719 "ConfigurationInterfaces.c"
+#line 729 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -724,11 +734,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 728 "ConfigurationInterfaces.c"
+#line 738 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 732 "ConfigurationInterfaces.c"
+#line 742 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -737,11 +747,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp2_;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 741 "ConfigurationInterfaces.c"
+#line 751 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
-#line 745 "ConfigurationInterfaces.c"
+#line 755 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -750,11 +760,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 754 "ConfigurationInterfaces.c"
+#line 764 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
-#line 758 "ConfigurationInterfaces.c"
+#line 768 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -763,11 +773,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 767 "ConfigurationInterfaces.c"
+#line 777 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
-#line 771 "ConfigurationInterfaces.c"
+#line 781 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -776,11 +786,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp5_;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 780 "ConfigurationInterfaces.c"
+#line 790 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
-#line 784 "ConfigurationInterfaces.c"
+#line 794 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -789,11 +799,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 793 "ConfigurationInterfaces.c"
+#line 803 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
-#line 797 "ConfigurationInterfaces.c"
+#line 807 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -802,11 +812,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp7_;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 806 "ConfigurationInterfaces.c"
+#line 816 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
-#line 810 "ConfigurationInterfaces.c"
+#line 820 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -815,11 +825,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp8_;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 819 "ConfigurationInterfaces.c"
+#line 829 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
-#line 823 "ConfigurationInterfaces.c"
+#line 833 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -828,11 +838,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp9_;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 832 "ConfigurationInterfaces.c"
+#line 842 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
-#line 836 "ConfigurationInterfaces.c"
+#line 846 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -841,11 +851,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp10_;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 845 "ConfigurationInterfaces.c"
+#line 855 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
-#line 849 "ConfigurationInterfaces.c"
+#line 859 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -854,11 +864,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp11_;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 858 "ConfigurationInterfaces.c"
+#line 868 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
-#line 862 "ConfigurationInterfaces.c"
+#line 872 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -867,11 +877,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp12_;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 871 "ConfigurationInterfaces.c"
+#line 881 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
-#line 875 "ConfigurationInterfaces.c"
+#line 885 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp13_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -880,11 +890,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 884 "ConfigurationInterfaces.c"
+#line 894 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
-#line 888 "ConfigurationInterfaces.c"
+#line 898 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp14_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -893,11 +903,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp14_;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 897 "ConfigurationInterfaces.c"
+#line 907 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
-#line 901 "ConfigurationInterfaces.c"
+#line 911 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp15_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -906,11 +916,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp15_;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 910 "ConfigurationInterfaces.c"
+#line 920 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
-#line 914 "ConfigurationInterfaces.c"
+#line 924 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp16_ = NULL;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -919,11 +929,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp16_;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 923 "ConfigurationInterfaces.c"
+#line 933 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
-#line 927 "ConfigurationInterfaces.c"
+#line 937 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp17_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -932,11 +942,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp17_;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 936 "ConfigurationInterfaces.c"
+#line 946 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
-#line 940 "ConfigurationInterfaces.c"
+#line 950 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp18_ = NULL;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -945,11 +955,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp18_;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 949 "ConfigurationInterfaces.c"
+#line 959 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
-#line 953 "ConfigurationInterfaces.c"
+#line 963 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp19_ = NULL;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -958,11 +968,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp19_;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 962 "ConfigurationInterfaces.c"
+#line 972 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
-#line 966 "ConfigurationInterfaces.c"
+#line 976 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp20_ = NULL;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -971,11 +981,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp20_;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 975 "ConfigurationInterfaces.c"
+#line 985 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
-#line 979 "ConfigurationInterfaces.c"
+#line 989 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp21_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -984,11 +994,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 988 "ConfigurationInterfaces.c"
+#line 998 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
-#line 992 "ConfigurationInterfaces.c"
+#line 1002 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp22_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -997,11 +1007,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp22_;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1001 "ConfigurationInterfaces.c"
+#line 1011 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
-#line 1005 "ConfigurationInterfaces.c"
+#line 1015 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp23_ = NULL;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1010,11 +1020,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp23_;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1014 "ConfigurationInterfaces.c"
+#line 1024 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1018 "ConfigurationInterfaces.c"
+#line 1028 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp24_ = NULL;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1023,11 +1033,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp24_;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1027 "ConfigurationInterfaces.c"
+#line 1037 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
-#line 1031 "ConfigurationInterfaces.c"
+#line 1041 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp25_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1036,11 +1046,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp25_;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1040 "ConfigurationInterfaces.c"
+#line 1050 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
-#line 1044 "ConfigurationInterfaces.c"
+#line 1054 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp26_ = NULL;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1049,11 +1059,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp26_;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1053 "ConfigurationInterfaces.c"
+#line 1063 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
-#line 1057 "ConfigurationInterfaces.c"
+#line 1067 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp27_ = NULL;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1062,11 +1072,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp27_;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1066 "ConfigurationInterfaces.c"
+#line 1076 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
-#line 1070 "ConfigurationInterfaces.c"
+#line 1080 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp28_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1075,11 +1085,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp28_;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1079 "ConfigurationInterfaces.c"
+#line 1089 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
-#line 1083 "ConfigurationInterfaces.c"
+#line 1093 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp29_ = NULL;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1088,11 +1098,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp29_;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1092 "ConfigurationInterfaces.c"
+#line 1102 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
-#line 1096 "ConfigurationInterfaces.c"
+#line 1106 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp30_ = NULL;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1101,11 +1111,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp30_;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1105 "ConfigurationInterfaces.c"
+#line 1115 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 1109 "ConfigurationInterfaces.c"
+#line 1119 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp31_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1114,11 +1124,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1118 "ConfigurationInterfaces.c"
+#line 1128 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1122 "ConfigurationInterfaces.c"
+#line 1132 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp32_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1127,11 +1137,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp32_;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1131 "ConfigurationInterfaces.c"
+#line 1141 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
-#line 1135 "ConfigurationInterfaces.c"
+#line 1145 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp33_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1140,11 +1150,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp33_;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1144 "ConfigurationInterfaces.c"
+#line 1154 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1148 "ConfigurationInterfaces.c"
+#line 1158 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp34_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1153,11 +1163,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp34_;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1157 "ConfigurationInterfaces.c"
+#line 1167 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
-#line 1161 "ConfigurationInterfaces.c"
+#line 1171 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp35_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1166,11 +1176,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp35_;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1170 "ConfigurationInterfaces.c"
+#line 1180 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
-#line 1174 "ConfigurationInterfaces.c"
+#line 1184 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp36_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1179,11 +1189,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1183 "ConfigurationInterfaces.c"
+#line 1193 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
-#line 1187 "ConfigurationInterfaces.c"
+#line 1197 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp37_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1192,11 +1202,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp37_;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1196 "ConfigurationInterfaces.c"
+#line 1206 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
-#line 1200 "ConfigurationInterfaces.c"
+#line 1210 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp38_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1205,11 +1215,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp38_;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1209 "ConfigurationInterfaces.c"
+#line 1219 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
-#line 1213 "ConfigurationInterfaces.c"
+#line 1223 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp39_ = NULL;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1218,11 +1228,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp39_;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1222 "ConfigurationInterfaces.c"
+#line 1232 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
-#line 1226 "ConfigurationInterfaces.c"
+#line 1236 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp40_ = NULL;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1231,11 +1241,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp40_;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1235 "ConfigurationInterfaces.c"
+#line 1245 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
-#line 1239 "ConfigurationInterfaces.c"
+#line 1249 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp41_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1244,11 +1254,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp41_;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1248 "ConfigurationInterfaces.c"
+#line 1258 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
-#line 1252 "ConfigurationInterfaces.c"
+#line 1262 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp42_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1257,11 +1267,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1261 "ConfigurationInterfaces.c"
+#line 1271 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
-#line 1265 "ConfigurationInterfaces.c"
+#line 1275 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp43_ = NULL;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1270,11 +1280,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp43_;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1274 "ConfigurationInterfaces.c"
+#line 1284 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
-#line 1278 "ConfigurationInterfaces.c"
+#line 1288 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp44_ = NULL;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1283,11 +1293,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp44_;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1287 "ConfigurationInterfaces.c"
+#line 1297 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
-#line 1291 "ConfigurationInterfaces.c"
+#line 1301 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp45_ = NULL;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1296,11 +1306,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp45_;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1300 "ConfigurationInterfaces.c"
+#line 1310 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
-#line 1304 "ConfigurationInterfaces.c"
+#line 1314 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp46_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1309,11 +1319,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp46_;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1313 "ConfigurationInterfaces.c"
+#line 1323 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
-#line 1317 "ConfigurationInterfaces.c"
+#line 1327 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp47_ = NULL;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1322,11 +1332,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp47_;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1326 "ConfigurationInterfaces.c"
+#line 1336 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
-#line 1330 "ConfigurationInterfaces.c"
+#line 1340 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp48_ = NULL;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1335,11 +1345,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp48_;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1339 "ConfigurationInterfaces.c"
+#line 1349 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
-#line 1343 "ConfigurationInterfaces.c"
+#line 1353 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp49_ = NULL;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1348,11 +1358,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp49_;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1352 "ConfigurationInterfaces.c"
+#line 1362 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
-#line 1356 "ConfigurationInterfaces.c"
+#line 1366 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp50_ = NULL;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1361,11 +1371,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp50_;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1365 "ConfigurationInterfaces.c"
+#line 1375 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
-#line 1369 "ConfigurationInterfaces.c"
+#line 1379 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp51_ = NULL;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1374,11 +1384,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp51_;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1378 "ConfigurationInterfaces.c"
+#line 1388 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
-#line 1382 "ConfigurationInterfaces.c"
+#line 1392 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp52_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1387,11 +1397,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp52_;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1391 "ConfigurationInterfaces.c"
+#line 1401 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
-#line 1395 "ConfigurationInterfaces.c"
+#line 1405 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp53_ = NULL;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1400,11 +1410,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp53_;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1404 "ConfigurationInterfaces.c"
+#line 1414 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
-#line 1408 "ConfigurationInterfaces.c"
+#line 1418 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp54_ = NULL;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1413,11 +1423,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp54_;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1417 "ConfigurationInterfaces.c"
+#line 1427 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
-#line 1421 "ConfigurationInterfaces.c"
+#line 1431 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp55_ = NULL;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1426,11 +1436,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp55_;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1430 "ConfigurationInterfaces.c"
+#line 1440 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
-#line 1434 "ConfigurationInterfaces.c"
+#line 1444 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp56_ = NULL;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1439,11 +1449,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp56_;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1443 "ConfigurationInterfaces.c"
+#line 1453 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
-#line 1447 "ConfigurationInterfaces.c"
+#line 1457 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp57_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1452,11 +1462,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp57_;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1456 "ConfigurationInterfaces.c"
+#line 1466 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
-#line 1460 "ConfigurationInterfaces.c"
+#line 1470 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp58_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1465,11 +1475,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp58_;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1469 "ConfigurationInterfaces.c"
+#line 1479 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
-#line 1473 "ConfigurationInterfaces.c"
+#line 1483 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp59_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1478,11 +1488,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp59_;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1482 "ConfigurationInterfaces.c"
+#line 1492 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
-#line 1486 "ConfigurationInterfaces.c"
+#line 1496 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp60_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1491,11 +1501,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp60_;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1495 "ConfigurationInterfaces.c"
+#line 1505 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
-#line 1499 "ConfigurationInterfaces.c"
+#line 1509 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp61_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1504,11 +1514,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp61_;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1508 "ConfigurationInterfaces.c"
+#line 1518 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
-#line 1512 "ConfigurationInterfaces.c"
+#line 1522 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp62_ = NULL;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1517,11 +1527,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp62_;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1521 "ConfigurationInterfaces.c"
+#line 1531 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
-#line 1525 "ConfigurationInterfaces.c"
+#line 1535 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp63_ = NULL;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1530,11 +1540,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp63_;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1534 "ConfigurationInterfaces.c"
+#line 1544 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
-#line 1538 "ConfigurationInterfaces.c"
+#line 1548 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp64_ = NULL;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1543,11 +1553,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp64_;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1547 "ConfigurationInterfaces.c"
+#line 1557 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
-#line 1551 "ConfigurationInterfaces.c"
+#line 1561 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp65_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1556,11 +1566,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp65_;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1560 "ConfigurationInterfaces.c"
+#line 1570 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
-#line 1564 "ConfigurationInterfaces.c"
+#line 1574 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp66_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1569,11 +1579,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp66_;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1573 "ConfigurationInterfaces.c"
+#line 1583 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
-#line 1577 "ConfigurationInterfaces.c"
+#line 1587 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp67_ = NULL;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1582,11 +1592,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp67_;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1586 "ConfigurationInterfaces.c"
+#line 1596 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
-#line 1590 "ConfigurationInterfaces.c"
+#line 1600 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp68_ = NULL;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1595,14 +1605,14 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp68_;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1599 "ConfigurationInterfaces.c"
+#line 1609 "ConfigurationInterfaces.c"
 		}
 		default:
 		{
 #line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_error ("ConfigurationInterfaces.vala:306: unknown ConfigurableProperty enumera" \
 "tion value");
-#line 1605 "ConfigurationInterfaces.c"
+#line 1615 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1625,7 +1635,7 @@ gchar* configuration_engine_get_name (ConfigurationEngine* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self);
-#line 1628 "ConfigurationInterfaces.c"
+#line 1638 "ConfigurationInterfaces.c"
 }
 
 
@@ -1634,7 +1644,7 @@ gint configuration_engine_get_int_property (ConfigurationEngine* self, Configura
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error);
-#line 1637 "ConfigurationInterfaces.c"
+#line 1647 "ConfigurationInterfaces.c"
 }
 
 
@@ -1643,7 +1653,7 @@ void configuration_engine_set_int_property (ConfigurationEngine* self, Configura
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error);
-#line 1646 "ConfigurationInterfaces.c"
+#line 1656 "ConfigurationInterfaces.c"
 }
 
 
@@ -1652,7 +1662,7 @@ gint configuration_engine_get_enum_property (ConfigurationEngine* self, Configur
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_enum_property (self, p, error);
-#line 1655 "ConfigurationInterfaces.c"
+#line 1665 "ConfigurationInterfaces.c"
 }
 
 
@@ -1661,7 +1671,7 @@ void configuration_engine_set_enum_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_enum_property (self, p, val, error);
-#line 1664 "ConfigurationInterfaces.c"
+#line 1674 "ConfigurationInterfaces.c"
 }
 
 
@@ -1670,7 +1680,7 @@ gchar* configuration_engine_get_string_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error);
-#line 1673 "ConfigurationInterfaces.c"
+#line 1683 "ConfigurationInterfaces.c"
 }
 
 
@@ -1679,7 +1689,7 @@ void configuration_engine_set_string_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error);
-#line 1682 "ConfigurationInterfaces.c"
+#line 1692 "ConfigurationInterfaces.c"
 }
 
 
@@ -1688,7 +1698,7 @@ gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error);
-#line 1691 "ConfigurationInterfaces.c"
+#line 1701 "ConfigurationInterfaces.c"
 }
 
 
@@ -1697,7 +1707,7 @@ void configuration_engine_set_bool_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error);
-#line 1700 "ConfigurationInterfaces.c"
+#line 1710 "ConfigurationInterfaces.c"
 }
 
 
@@ -1706,7 +1716,7 @@ gdouble configuration_engine_get_double_property (ConfigurationEngine* self, Con
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error);
-#line 1709 "ConfigurationInterfaces.c"
+#line 1719 "ConfigurationInterfaces.c"
 }
 
 
@@ -1715,7 +1725,7 @@ void configuration_engine_set_double_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error);
-#line 1718 "ConfigurationInterfaces.c"
+#line 1728 "ConfigurationInterfaces.c"
 }
 
 
@@ -1724,7 +1734,7 @@ gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_bool (self, domain, id, key, def);
-#line 1727 "ConfigurationInterfaces.c"
+#line 1737 "ConfigurationInterfaces.c"
 }
 
 
@@ -1733,7 +1743,7 @@ void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val);
-#line 1736 "ConfigurationInterfaces.c"
+#line 1746 "ConfigurationInterfaces.c"
 }
 
 
@@ -1742,7 +1752,7 @@ gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_double (self, domain, id, key, def);
-#line 1745 "ConfigurationInterfaces.c"
+#line 1755 "ConfigurationInterfaces.c"
 }
 
 
@@ -1751,7 +1761,7 @@ void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val);
-#line 1754 "ConfigurationInterfaces.c"
+#line 1764 "ConfigurationInterfaces.c"
 }
 
 
@@ -1760,7 +1770,7 @@ gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_int (self, domain, id, key, def);
-#line 1763 "ConfigurationInterfaces.c"
+#line 1773 "ConfigurationInterfaces.c"
 }
 
 
@@ -1769,7 +1779,7 @@ void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val);
-#line 1772 "ConfigurationInterfaces.c"
+#line 1782 "ConfigurationInterfaces.c"
 }
 
 
@@ -1778,7 +1788,7 @@ gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_string (self, domain, id, key, def);
-#line 1781 "ConfigurationInterfaces.c"
+#line 1791 "ConfigurationInterfaces.c"
 }
 
 
@@ -1787,7 +1797,7 @@ void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val);
-#line 1790 "ConfigurationInterfaces.c"
+#line 1800 "ConfigurationInterfaces.c"
 }
 
 
@@ -1796,7 +1806,7 @@ void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gch
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key);
-#line 1799 "ConfigurationInterfaces.c"
+#line 1809 "ConfigurationInterfaces.c"
 }
 
 
@@ -1805,7 +1815,7 @@ FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine*
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id);
-#line 1808 "ConfigurationInterfaces.c"
+#line 1818 "ConfigurationInterfaces.c"
 }
 
 
@@ -1814,7 +1824,7 @@ void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const g
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled);
-#line 1817 "ConfigurationInterfaces.c"
+#line 1827 "ConfigurationInterfaces.c"
 }
 
 
@@ -1827,7 +1837,7 @@ static void configuration_engine_base_init (ConfigurationEngineIface * iface) {
 		initialized = TRUE;
 #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_signal_new ("property_changed", TYPE_CONFIGURATION_ENGINE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_CONFIGURABLE_PROPERTY);
-#line 1830 "ConfigurationInterfaces.c"
+#line 1840 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1848,14 +1858,14 @@ GType configuration_engine_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1851 "ConfigurationInterfaces.c"
+#line 1861 "ConfigurationInterfaces.c"
 }
 
 
 static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self) {
 #line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_on_property_changed ((ConfigurationFacade*) self, p);
-#line 1858 "ConfigurationInterfaces.c"
+#line 1868 "ConfigurationInterfaces.c"
 }
 
 
@@ -1882,7 +1892,7 @@ ConfigurationFacade* configuration_facade_construct (GType object_type, Configur
 	g_signal_connect_object (_tmp2_, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0);
 #line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self;
-#line 1885 "ConfigurationInterfaces.c"
+#line 1895 "ConfigurationInterfaces.c"
 }
 
 
@@ -1910,70 +1920,70 @@ static void configuration_facade_on_property_changed (ConfigurationFacade* self,
 	switch (_tmp3_) {
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 1912 "ConfigurationInterfaces.c"
+#line 1922 "ConfigurationInterfaces.c"
 		{
 #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "auto-import-from-library-changed");
 #line 367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1918 "ConfigurationInterfaces.c"
+#line 1928 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 1922 "ConfigurationInterfaces.c"
+#line 1932 "ConfigurationInterfaces.c"
 		{
 #line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "bg-color-name-changed");
 #line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1928 "ConfigurationInterfaces.c"
+#line 1938 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 1932 "ConfigurationInterfaces.c"
+#line 1942 "ConfigurationInterfaces.c"
 		{
 #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "commit-metadata-to-masters-changed");
 #line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1938 "ConfigurationInterfaces.c"
+#line 1948 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1942 "ConfigurationInterfaces.c"
+#line 1952 "ConfigurationInterfaces.c"
 		{
 #line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "events-sort-ascending-changed");
 #line 379 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1948 "ConfigurationInterfaces.c"
+#line 1958 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1954 "ConfigurationInterfaces.c"
+#line 1964 "ConfigurationInterfaces.c"
 		{
 #line 383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "external-app-changed");
 #line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1960 "ConfigurationInterfaces.c"
+#line 1970 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1964 "ConfigurationInterfaces.c"
+#line 1974 "ConfigurationInterfaces.c"
 		{
 #line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "import-directory-changed");
 #line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1970 "ConfigurationInterfaces.c"
+#line 1980 "ConfigurationInterfaces.c"
 		}
 		default:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		break;
-#line 1975 "ConfigurationInterfaces.c"
+#line 1985 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1992,7 +2002,7 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self)
 	result = _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 1994 "ConfigurationInterfaces.c"
+#line 2004 "ConfigurationInterfaces.c"
 }
 
 
@@ -2004,7 +2014,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 	_tmp0_ = err;
 #line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) {
-#line 2006 "ConfigurationInterfaces.c"
+#line 2016 "ConfigurationInterfaces.c"
 		ConfigurationEngine* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -2025,14 +2035,14 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_);
 #line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp3_);
-#line 2026 "ConfigurationInterfaces.c"
+#line 2036 "ConfigurationInterfaces.c"
 	} else {
 		GError* _tmp6_ = NULL;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) {
-#line 2033 "ConfigurationInterfaces.c"
+#line 2043 "ConfigurationInterfaces.c"
 			ConfigurationEngine* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
@@ -2053,7 +2063,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "GINE_ERROR: %s", _tmp9_, _tmp11_);
 #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp9_);
-#line 2053 "ConfigurationInterfaces.c"
+#line 2063 "ConfigurationInterfaces.c"
 		} else {
 			ConfigurationEngine* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
@@ -2075,7 +2085,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "known error: %s", _tmp14_, _tmp16_);
 #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp14_);
-#line 2074 "ConfigurationInterfaces.c"
+#line 2084 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -2106,8 +2116,8 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2105 "ConfigurationInterfaces.c"
-				goto __catch81_configuration_error;
+#line 2115 "ConfigurationInterfaces.c"
+				goto __catch82_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2115,16 +2125,16 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 2114 "ConfigurationInterfaces.c"
+#line 2124 "ConfigurationInterfaces.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2120 "ConfigurationInterfaces.c"
+#line 2130 "ConfigurationInterfaces.c"
 	}
-	goto __finally81;
-	__catch81_configuration_error:
+	goto __finally82;
+	__catch82_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2142,16 +2152,16 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		_g_error_free0 (err);
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2141 "ConfigurationInterfaces.c"
+#line 2151 "ConfigurationInterfaces.c"
 	}
-	__finally81:
+	__finally82:
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 2150 "ConfigurationInterfaces.c"
+#line 2160 "ConfigurationInterfaces.c"
 }
 
 
@@ -2160,7 +2170,7 @@ gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self);
-#line 2159 "ConfigurationInterfaces.c"
+#line 2169 "ConfigurationInterfaces.c"
 }
 
 
@@ -2184,8 +2194,8 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2183 "ConfigurationInterfaces.c"
-				goto __catch82_configuration_error;
+#line 2193 "ConfigurationInterfaces.c"
+				goto __catch83_configuration_error;
 			}
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2193,11 +2203,11 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 			g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2192 "ConfigurationInterfaces.c"
+#line 2202 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally82;
-	__catch82_configuration_error:
+	goto __finally83;
+	__catch83_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2213,9 +2223,9 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		_g_error_free0 (err);
 #line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2212 "ConfigurationInterfaces.c"
+#line 2222 "ConfigurationInterfaces.c"
 	}
-	__finally82:
+	__finally83:
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2224,7 +2234,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2223 "ConfigurationInterfaces.c"
+#line 2233 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2234,7 +2244,7 @@ void configuration_facade_set_auto_import_from_library (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import);
-#line 2233 "ConfigurationInterfaces.c"
+#line 2243 "ConfigurationInterfaces.c"
 }
 
 
@@ -2264,8 +2274,8 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2263 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+#line 2273 "ConfigurationInterfaces.c"
+				goto __catch84_configuration_error;
 			}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2273,7 +2283,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2272 "ConfigurationInterfaces.c"
+#line 2282 "ConfigurationInterfaces.c"
 		}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2285,10 +2295,10 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_free0 (_tmp0_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2284 "ConfigurationInterfaces.c"
+#line 2294 "ConfigurationInterfaces.c"
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally84;
+	__catch84_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2309,16 +2319,16 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2308 "ConfigurationInterfaces.c"
+#line 2318 "ConfigurationInterfaces.c"
 	}
-	__finally83:
+	__finally84:
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2317 "ConfigurationInterfaces.c"
+#line 2327 "ConfigurationInterfaces.c"
 }
 
 
@@ -2327,7 +2337,7 @@ gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self);
-#line 2326 "ConfigurationInterfaces.c"
+#line 2336 "ConfigurationInterfaces.c"
 }
 
 
@@ -2335,7 +2345,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 	GError * _inner_error_ = NULL;
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (color_name != NULL);
-#line 2334 "ConfigurationInterfaces.c"
+#line 2344 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2354,8 +2364,8 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2353 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+#line 2363 "ConfigurationInterfaces.c"
+				goto __catch85_configuration_error;
 			}
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2363,11 +2373,11 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2362 "ConfigurationInterfaces.c"
+#line 2372 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally85;
+	__catch85_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2383,9 +2393,9 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2382 "ConfigurationInterfaces.c"
+#line 2392 "ConfigurationInterfaces.c"
 	}
-	__finally84:
+	__finally85:
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2394,7 +2404,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2393 "ConfigurationInterfaces.c"
+#line 2403 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2404,7 +2414,7 @@ void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name);
-#line 2403 "ConfigurationInterfaces.c"
+#line 2413 "ConfigurationInterfaces.c"
 }
 
 
@@ -2433,8 +2443,8 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2432 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+#line 2442 "ConfigurationInterfaces.c"
+				goto __catch86_configuration_error;
 			}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2442,16 +2452,16 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 			g_clear_error (&_inner_error_);
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 2441 "ConfigurationInterfaces.c"
+#line 2451 "ConfigurationInterfaces.c"
 		}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2447 "ConfigurationInterfaces.c"
+#line 2457 "ConfigurationInterfaces.c"
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally86;
+	__catch86_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2469,16 +2479,16 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		_g_error_free0 (err);
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2468 "ConfigurationInterfaces.c"
+#line 2478 "ConfigurationInterfaces.c"
 	}
-	__finally85:
+	__finally86:
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 2477 "ConfigurationInterfaces.c"
+#line 2487 "ConfigurationInterfaces.c"
 }
 
 
@@ -2487,7 +2497,7 @@ gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacad
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self);
-#line 2486 "ConfigurationInterfaces.c"
+#line 2496 "ConfigurationInterfaces.c"
 }
 
 
@@ -2511,8 +2521,8 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2510 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2520 "ConfigurationInterfaces.c"
+				goto __catch87_configuration_error;
 			}
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2520,11 +2530,11 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 			g_clear_error (&_inner_error_);
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2519 "ConfigurationInterfaces.c"
+#line 2529 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally87;
+	__catch87_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2540,9 +2550,9 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		_g_error_free0 (err);
 #line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2539 "ConfigurationInterfaces.c"
+#line 2549 "ConfigurationInterfaces.c"
 	}
-	__finally86:
+	__finally87:
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2551,7 +2561,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		g_clear_error (&_inner_error_);
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2550 "ConfigurationInterfaces.c"
+#line 2560 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2561,7 +2571,7 @@ void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* s
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata);
-#line 2560 "ConfigurationInterfaces.c"
+#line 2570 "ConfigurationInterfaces.c"
 }
 
 
@@ -2591,8 +2601,8 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2590 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+#line 2600 "ConfigurationInterfaces.c"
+				goto __catch88_configuration_error;
 			}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2600,7 +2610,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2599 "ConfigurationInterfaces.c"
+#line 2609 "ConfigurationInterfaces.c"
 		}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2612,10 +2622,10 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2611 "ConfigurationInterfaces.c"
+#line 2621 "ConfigurationInterfaces.c"
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally88;
+	__catch88_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2636,16 +2646,16 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_error_free0 (err);
 #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2635 "ConfigurationInterfaces.c"
+#line 2645 "ConfigurationInterfaces.c"
 	}
-	__finally87:
+	__finally88:
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2644 "ConfigurationInterfaces.c"
+#line 2654 "ConfigurationInterfaces.c"
 }
 
 
@@ -2654,7 +2664,7 @@ gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self);
-#line 2653 "ConfigurationInterfaces.c"
+#line 2663 "ConfigurationInterfaces.c"
 }
 
 
@@ -2662,7 +2672,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2661 "ConfigurationInterfaces.c"
+#line 2671 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2683,8 +2693,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2682 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2692 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2692,7 +2702,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2691 "ConfigurationInterfaces.c"
+#line 2701 "ConfigurationInterfaces.c"
 		}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2706,8 +2716,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2705 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2715 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2715,11 +2725,11 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2714 "ConfigurationInterfaces.c"
+#line 2724 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally89;
+	__catch89_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2733,9 +2743,9 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2732 "ConfigurationInterfaces.c"
+#line 2742 "ConfigurationInterfaces.c"
 	}
-	__finally88:
+	__finally89:
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2744,7 +2754,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2743 "ConfigurationInterfaces.c"
+#line 2753 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2754,7 +2764,7 @@ void configuration_facade_set_desktop_background (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename);
-#line 2753 "ConfigurationInterfaces.c"
+#line 2763 "ConfigurationInterfaces.c"
 }
 
 
@@ -2784,8 +2794,8 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2783 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 2793 "ConfigurationInterfaces.c"
+				goto __catch90_configuration_error;
 			}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2793,7 +2803,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2792 "ConfigurationInterfaces.c"
+#line 2802 "ConfigurationInterfaces.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2805,10 +2815,10 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_free0 (_tmp0_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2804 "ConfigurationInterfaces.c"
+#line 2814 "ConfigurationInterfaces.c"
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally90;
+	__catch90_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2829,16 +2839,16 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2828 "ConfigurationInterfaces.c"
+#line 2838 "ConfigurationInterfaces.c"
 	}
-	__finally89:
+	__finally90:
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2837 "ConfigurationInterfaces.c"
+#line 2847 "ConfigurationInterfaces.c"
 }
 
 
@@ -2847,7 +2857,7 @@ gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self);
-#line 2846 "ConfigurationInterfaces.c"
+#line 2856 "ConfigurationInterfaces.c"
 }
 
 
@@ -2855,7 +2865,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 	GError * _inner_error_ = NULL;
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2854 "ConfigurationInterfaces.c"
+#line 2864 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2876,8 +2886,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2875 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 2885 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2885,7 +2895,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2884 "ConfigurationInterfaces.c"
+#line 2894 "ConfigurationInterfaces.c"
 		}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2899,8 +2909,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2898 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 2908 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2908,11 +2918,11 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2907 "ConfigurationInterfaces.c"
+#line 2917 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2926,9 +2936,9 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2925 "ConfigurationInterfaces.c"
+#line 2935 "ConfigurationInterfaces.c"
 	}
-	__finally90:
+	__finally91:
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2937,7 +2947,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		g_clear_error (&_inner_error_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2936 "ConfigurationInterfaces.c"
+#line 2946 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2947,7 +2957,7 @@ void configuration_facade_set_screensaver (ConfigurationFacade* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename);
-#line 2946 "ConfigurationInterfaces.c"
+#line 2956 "ConfigurationInterfaces.c"
 }
 
 
@@ -2978,8 +2988,8 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2977 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 2987 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2987,17 +2997,17 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2986 "ConfigurationInterfaces.c"
+#line 2996 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_strcmp0 (s, "") == 0) {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = NULL;
-#line 2992 "ConfigurationInterfaces.c"
+#line 3002 "ConfigurationInterfaces.c"
 		} else {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 2996 "ConfigurationInterfaces.c"
+#line 3006 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
@@ -3007,10 +3017,10 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_free0 (s);
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3006 "ConfigurationInterfaces.c"
+#line 3016 "ConfigurationInterfaces.c"
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3031,16 +3041,16 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_error_free0 (err);
 #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3030 "ConfigurationInterfaces.c"
+#line 3040 "ConfigurationInterfaces.c"
 	}
-	__finally91:
+	__finally92:
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3039 "ConfigurationInterfaces.c"
+#line 3049 "ConfigurationInterfaces.c"
 }
 
 
@@ -3049,7 +3059,7 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self);
-#line 3048 "ConfigurationInterfaces.c"
+#line 3058 "ConfigurationInterfaces.c"
 }
 
 
@@ -3066,7 +3076,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (_tmp0_ == NULL) {
 #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 3065 "ConfigurationInterfaces.c"
+#line 3075 "ConfigurationInterfaces.c"
 		}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
@@ -3082,8 +3092,8 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3081 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3091 "ConfigurationInterfaces.c"
+				goto __catch93_configuration_error;
 			}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3091,11 +3101,11 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3090 "ConfigurationInterfaces.c"
+#line 3100 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3109,9 +3119,9 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp4_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3108 "ConfigurationInterfaces.c"
+#line 3118 "ConfigurationInterfaces.c"
 	}
-	__finally92:
+	__finally93:
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3120,7 +3130,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3119 "ConfigurationInterfaces.c"
+#line 3129 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3130,7 +3140,7 @@ void configuration_facade_set_directory_pattern (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s);
-#line 3129 "ConfigurationInterfaces.c"
+#line 3139 "ConfigurationInterfaces.c"
 }
 
 
@@ -3160,8 +3170,8 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3159 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3169 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3169,7 +3179,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 			g_clear_error (&_inner_error_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3168 "ConfigurationInterfaces.c"
+#line 3178 "ConfigurationInterfaces.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -3181,10 +3191,10 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_free0 (_tmp0_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3180 "ConfigurationInterfaces.c"
+#line 3190 "ConfigurationInterfaces.c"
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3205,16 +3215,16 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_error_free0 (err);
 #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3204 "ConfigurationInterfaces.c"
+#line 3214 "ConfigurationInterfaces.c"
 	}
-	__finally93:
+	__finally94:
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3213 "ConfigurationInterfaces.c"
+#line 3223 "ConfigurationInterfaces.c"
 }
 
 
@@ -3223,7 +3233,7 @@ gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self);
-#line 3222 "ConfigurationInterfaces.c"
+#line 3232 "ConfigurationInterfaces.c"
 }
 
 
@@ -3231,7 +3241,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 	GError * _inner_error_ = NULL;
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (s != NULL);
-#line 3230 "ConfigurationInterfaces.c"
+#line 3240 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3250,8 +3260,8 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3249 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3259 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3259,11 +3269,11 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 			g_clear_error (&_inner_error_);
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3258 "ConfigurationInterfaces.c"
+#line 3268 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally95;
+	__catch95_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3277,9 +3287,9 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3276 "ConfigurationInterfaces.c"
+#line 3286 "ConfigurationInterfaces.c"
 	}
-	__finally94:
+	__finally95:
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3288,7 +3298,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		g_clear_error (&_inner_error_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3287 "ConfigurationInterfaces.c"
+#line 3297 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3298,7 +3308,7 @@ void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s);
-#line 3297 "ConfigurationInterfaces.c"
+#line 3307 "ConfigurationInterfaces.c"
 }
 
 
@@ -3310,7 +3320,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 	_vala_maximize = FALSE;
 #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 3309 "ConfigurationInterfaces.c"
+#line 3319 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3345,8 +3355,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3344 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3354 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3354,7 +3364,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3353 "ConfigurationInterfaces.c"
+#line 3363 "ConfigurationInterfaces.c"
 		}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -3374,8 +3384,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3373 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3383 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3383,7 +3393,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3382 "ConfigurationInterfaces.c"
+#line 3392 "ConfigurationInterfaces.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -3401,8 +3411,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3400 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3410 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3410,7 +3420,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3409 "ConfigurationInterfaces.c"
+#line 3419 "ConfigurationInterfaces.c"
 		}
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -3418,10 +3428,10 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		_tmp14_ = h;
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 3417 "ConfigurationInterfaces.c"
+#line 3427 "ConfigurationInterfaces.c"
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally96;
+	__catch96_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -3435,9 +3445,9 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3434 "ConfigurationInterfaces.c"
+#line 3444 "ConfigurationInterfaces.c"
 	}
-	__finally95:
+	__finally96:
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3446,19 +3456,19 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3445 "ConfigurationInterfaces.c"
+#line 3455 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 3451 "ConfigurationInterfaces.c"
+#line 3461 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 3457 "ConfigurationInterfaces.c"
+#line 3467 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3468,7 +3478,7 @@ void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions);
-#line 3467 "ConfigurationInterfaces.c"
+#line 3477 "ConfigurationInterfaces.c"
 }
 
 
@@ -3476,7 +3486,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 3475 "ConfigurationInterfaces.c"
+#line 3485 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3503,8 +3513,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3502 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3512 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3512,7 +3522,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3511 "ConfigurationInterfaces.c"
+#line 3521 "ConfigurationInterfaces.c"
 		}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -3530,8 +3540,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3529 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3539 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3539,7 +3549,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3538 "ConfigurationInterfaces.c"
+#line 3548 "ConfigurationInterfaces.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -3557,8 +3567,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3556 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3566 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3566,11 +3576,11 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3565 "ConfigurationInterfaces.c"
+#line 3575 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally97;
+	__catch97_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -3584,9 +3594,9 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3583 "ConfigurationInterfaces.c"
+#line 3593 "ConfigurationInterfaces.c"
 	}
-	__finally96:
+	__finally97:
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3595,7 +3605,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3594 "ConfigurationInterfaces.c"
+#line 3604 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3605,7 +3615,7 @@ void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions);
-#line 3604 "ConfigurationInterfaces.c"
+#line 3614 "ConfigurationInterfaces.c"
 }
 
 
@@ -3634,8 +3644,8 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3633 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3643 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3643,16 +3653,16 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 			g_clear_error (&_inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3642 "ConfigurationInterfaces.c"
+#line 3652 "ConfigurationInterfaces.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3648 "ConfigurationInterfaces.c"
+#line 3658 "ConfigurationInterfaces.c"
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally98;
+	__catch98_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3670,16 +3680,16 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		_g_error_free0 (err);
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3669 "ConfigurationInterfaces.c"
+#line 3679 "ConfigurationInterfaces.c"
 	}
-	__finally97:
+	__finally98:
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3678 "ConfigurationInterfaces.c"
+#line 3688 "ConfigurationInterfaces.c"
 }
 
 
@@ -3688,7 +3698,7 @@ gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self);
-#line 3687 "ConfigurationInterfaces.c"
+#line 3697 "ConfigurationInterfaces.c"
 }
 
 
@@ -3712,8 +3722,8 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3711 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3721 "ConfigurationInterfaces.c"
+				goto __catch99_configuration_error;
 			}
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3721,11 +3731,11 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 			g_clear_error (&_inner_error_);
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3720 "ConfigurationInterfaces.c"
+#line 3730 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3739,9 +3749,9 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3738 "ConfigurationInterfaces.c"
+#line 3748 "ConfigurationInterfaces.c"
 	}
-	__finally98:
+	__finally99:
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3750,7 +3760,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3749 "ConfigurationInterfaces.c"
+#line 3759 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3760,7 +3770,7 @@ void configuration_facade_set_display_basic_properties (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display);
-#line 3759 "ConfigurationInterfaces.c"
+#line 3769 "ConfigurationInterfaces.c"
 }
 
 
@@ -3789,8 +3799,8 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3788 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+#line 3798 "ConfigurationInterfaces.c"
+				goto __catch100_configuration_error;
 			}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3798,16 +3808,16 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 			g_clear_error (&_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3797 "ConfigurationInterfaces.c"
+#line 3807 "ConfigurationInterfaces.c"
 		}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3803 "ConfigurationInterfaces.c"
+#line 3813 "ConfigurationInterfaces.c"
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3825,16 +3835,16 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		_g_error_free0 (err);
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3824 "ConfigurationInterfaces.c"
+#line 3834 "ConfigurationInterfaces.c"
 	}
-	__finally99:
+	__finally100:
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3833 "ConfigurationInterfaces.c"
+#line 3843 "ConfigurationInterfaces.c"
 }
 
 
@@ -3843,7 +3853,7 @@ gboolean configuration_facade_get_display_extended_properties (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self);
-#line 3842 "ConfigurationInterfaces.c"
+#line 3852 "ConfigurationInterfaces.c"
 }
 
 
@@ -3867,8 +3877,8 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3866 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+#line 3876 "ConfigurationInterfaces.c"
+				goto __catch101_configuration_error;
 			}
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3876,11 +3886,11 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 			g_clear_error (&_inner_error_);
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3875 "ConfigurationInterfaces.c"
+#line 3885 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3894,9 +3904,9 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3893 "ConfigurationInterfaces.c"
+#line 3903 "ConfigurationInterfaces.c"
 	}
-	__finally100:
+	__finally101:
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3905,7 +3915,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		g_clear_error (&_inner_error_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3904 "ConfigurationInterfaces.c"
+#line 3914 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3915,7 +3925,7 @@ void configuration_facade_set_display_extended_properties (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display);
-#line 3914 "ConfigurationInterfaces.c"
+#line 3924 "ConfigurationInterfaces.c"
 }
 
 
@@ -3944,8 +3954,8 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3943 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+#line 3953 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3953,16 +3963,16 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3952 "ConfigurationInterfaces.c"
+#line 3962 "ConfigurationInterfaces.c"
 		}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3958 "ConfigurationInterfaces.c"
+#line 3968 "ConfigurationInterfaces.c"
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3980,16 +3990,16 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3979 "ConfigurationInterfaces.c"
+#line 3989 "ConfigurationInterfaces.c"
 	}
-	__finally101:
+	__finally102:
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3988 "ConfigurationInterfaces.c"
+#line 3998 "ConfigurationInterfaces.c"
 }
 
 
@@ -3998,7 +4008,7 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self);
-#line 3997 "ConfigurationInterfaces.c"
+#line 4007 "ConfigurationInterfaces.c"
 }
 
 
@@ -4022,8 +4032,8 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4021 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+#line 4031 "ConfigurationInterfaces.c"
+				goto __catch103_configuration_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4031,11 +4041,11 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4030 "ConfigurationInterfaces.c"
+#line 4040 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4049,9 +4059,9 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4048 "ConfigurationInterfaces.c"
+#line 4058 "ConfigurationInterfaces.c"
 	}
-	__finally102:
+	__finally103:
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4060,7 +4070,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4059 "ConfigurationInterfaces.c"
+#line 4069 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4070,7 +4080,7 @@ void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display);
-#line 4069 "ConfigurationInterfaces.c"
+#line 4079 "ConfigurationInterfaces.c"
 }
 
 
@@ -4099,8 +4109,8 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4098 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+#line 4108 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4108,16 +4118,16 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4107 "ConfigurationInterfaces.c"
+#line 4117 "ConfigurationInterfaces.c"
 		}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4113 "ConfigurationInterfaces.c"
+#line 4123 "ConfigurationInterfaces.c"
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4135,16 +4145,16 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4134 "ConfigurationInterfaces.c"
+#line 4144 "ConfigurationInterfaces.c"
 	}
-	__finally103:
+	__finally104:
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4143 "ConfigurationInterfaces.c"
+#line 4153 "ConfigurationInterfaces.c"
 }
 
 
@@ -4153,7 +4163,7 @@ gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self);
-#line 4152 "ConfigurationInterfaces.c"
+#line 4162 "ConfigurationInterfaces.c"
 }
 
 
@@ -4177,8 +4187,8 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4176 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+#line 4186 "ConfigurationInterfaces.c"
+				goto __catch105_configuration_error;
 			}
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4186,11 +4196,11 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4185 "ConfigurationInterfaces.c"
+#line 4195 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4204,9 +4214,9 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4203 "ConfigurationInterfaces.c"
+#line 4213 "ConfigurationInterfaces.c"
 	}
-	__finally104:
+	__finally105:
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4215,7 +4225,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4214 "ConfigurationInterfaces.c"
+#line 4224 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4225,7 +4235,7 @@ void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display);
-#line 4224 "ConfigurationInterfaces.c"
+#line 4234 "ConfigurationInterfaces.c"
 }
 
 
@@ -4254,8 +4264,8 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4253 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+#line 4263 "ConfigurationInterfaces.c"
+				goto __catch106_configuration_error;
 			}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4263,16 +4273,16 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4262 "ConfigurationInterfaces.c"
+#line 4272 "ConfigurationInterfaces.c"
 		}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4268 "ConfigurationInterfaces.c"
+#line 4278 "ConfigurationInterfaces.c"
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4290,16 +4300,16 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		_g_error_free0 (err);
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4289 "ConfigurationInterfaces.c"
+#line 4299 "ConfigurationInterfaces.c"
 	}
-	__finally105:
+	__finally106:
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4298 "ConfigurationInterfaces.c"
+#line 4308 "ConfigurationInterfaces.c"
 }
 
 
@@ -4308,7 +4318,7 @@ gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self);
-#line 4307 "ConfigurationInterfaces.c"
+#line 4317 "ConfigurationInterfaces.c"
 }
 
 
@@ -4332,8 +4342,8 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4331 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+#line 4341 "ConfigurationInterfaces.c"
+				goto __catch107_configuration_error;
 			}
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4341,11 +4351,11 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4340 "ConfigurationInterfaces.c"
+#line 4350 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4359,9 +4369,9 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4358 "ConfigurationInterfaces.c"
+#line 4368 "ConfigurationInterfaces.c"
 	}
-	__finally106:
+	__finally107:
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4370,7 +4380,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4369 "ConfigurationInterfaces.c"
+#line 4379 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4380,7 +4390,7 @@ void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display);
-#line 4379 "ConfigurationInterfaces.c"
+#line 4389 "ConfigurationInterfaces.c"
 }
 
 
@@ -4409,8 +4419,8 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4408 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+#line 4418 "ConfigurationInterfaces.c"
+				goto __catch108_configuration_error;
 			}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4418,16 +4428,16 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 			g_clear_error (&_inner_error_);
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4417 "ConfigurationInterfaces.c"
+#line 4427 "ConfigurationInterfaces.c"
 		}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4423 "ConfigurationInterfaces.c"
+#line 4433 "ConfigurationInterfaces.c"
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4445,16 +4455,16 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		_g_error_free0 (err);
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4444 "ConfigurationInterfaces.c"
+#line 4454 "ConfigurationInterfaces.c"
 	}
-	__finally107:
+	__finally108:
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4453 "ConfigurationInterfaces.c"
+#line 4463 "ConfigurationInterfaces.c"
 }
 
 
@@ -4463,7 +4473,7 @@ gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self);
-#line 4462 "ConfigurationInterfaces.c"
+#line 4472 "ConfigurationInterfaces.c"
 }
 
 
@@ -4487,8 +4497,8 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4486 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+#line 4496 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4496,11 +4506,11 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4495 "ConfigurationInterfaces.c"
+#line 4505 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4514,9 +4524,9 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4513 "ConfigurationInterfaces.c"
+#line 4523 "ConfigurationInterfaces.c"
 	}
-	__finally108:
+	__finally109:
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4525,7 +4535,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4524 "ConfigurationInterfaces.c"
+#line 4534 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4535,7 +4545,7 @@ void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display);
-#line 4534 "ConfigurationInterfaces.c"
+#line 4544 "ConfigurationInterfaces.c"
 }
 
 
@@ -4564,8 +4574,8 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4563 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+#line 4573 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4573,16 +4583,16 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4572 "ConfigurationInterfaces.c"
+#line 4582 "ConfigurationInterfaces.c"
 		}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4578 "ConfigurationInterfaces.c"
+#line 4588 "ConfigurationInterfaces.c"
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4600,16 +4610,16 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		_g_error_free0 (err);
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4599 "ConfigurationInterfaces.c"
+#line 4609 "ConfigurationInterfaces.c"
 	}
-	__finally109:
+	__finally110:
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4608 "ConfigurationInterfaces.c"
+#line 4618 "ConfigurationInterfaces.c"
 }
 
 
@@ -4618,7 +4628,7 @@ gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self);
-#line 4617 "ConfigurationInterfaces.c"
+#line 4627 "ConfigurationInterfaces.c"
 }
 
 
@@ -4642,8 +4652,8 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4641 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+#line 4651 "ConfigurationInterfaces.c"
+				goto __catch111_configuration_error;
 			}
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4651,11 +4661,11 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4650 "ConfigurationInterfaces.c"
+#line 4660 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4669,9 +4679,9 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4668 "ConfigurationInterfaces.c"
+#line 4678 "ConfigurationInterfaces.c"
 	}
-	__finally110:
+	__finally111:
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4680,7 +4690,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4679 "ConfigurationInterfaces.c"
+#line 4689 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4690,7 +4700,7 @@ void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display);
-#line 4689 "ConfigurationInterfaces.c"
+#line 4699 "ConfigurationInterfaces.c"
 }
 
 
@@ -4719,8 +4729,8 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4718 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+#line 4728 "ConfigurationInterfaces.c"
+				goto __catch112_configuration_error;
 			}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4728,16 +4738,16 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 			g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4727 "ConfigurationInterfaces.c"
+#line 4737 "ConfigurationInterfaces.c"
 		}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4733 "ConfigurationInterfaces.c"
+#line 4743 "ConfigurationInterfaces.c"
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4755,16 +4765,16 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		_g_error_free0 (err);
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4754 "ConfigurationInterfaces.c"
+#line 4764 "ConfigurationInterfaces.c"
 	}
-	__finally111:
+	__finally112:
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4763 "ConfigurationInterfaces.c"
+#line 4773 "ConfigurationInterfaces.c"
 }
 
 
@@ -4773,7 +4783,7 @@ gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self);
-#line 4772 "ConfigurationInterfaces.c"
+#line 4782 "ConfigurationInterfaces.c"
 }
 
 
@@ -4797,8 +4807,8 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4796 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+#line 4806 "ConfigurationInterfaces.c"
+				goto __catch113_configuration_error;
 			}
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4806,11 +4816,11 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4805 "ConfigurationInterfaces.c"
+#line 4815 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4824,9 +4834,9 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4823 "ConfigurationInterfaces.c"
+#line 4833 "ConfigurationInterfaces.c"
 	}
-	__finally112:
+	__finally113:
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4835,7 +4845,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4834 "ConfigurationInterfaces.c"
+#line 4844 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4845,7 +4855,7 @@ void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display);
-#line 4844 "ConfigurationInterfaces.c"
+#line 4854 "ConfigurationInterfaces.c"
 }
 
 
@@ -4874,8 +4884,8 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4873 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+#line 4883 "ConfigurationInterfaces.c"
+				goto __catch114_configuration_error;
 			}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4883,16 +4893,16 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4882 "ConfigurationInterfaces.c"
+#line 4892 "ConfigurationInterfaces.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4888 "ConfigurationInterfaces.c"
+#line 4898 "ConfigurationInterfaces.c"
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4910,16 +4920,16 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		_g_error_free0 (err);
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4909 "ConfigurationInterfaces.c"
+#line 4919 "ConfigurationInterfaces.c"
 	}
-	__finally113:
+	__finally114:
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4918 "ConfigurationInterfaces.c"
+#line 4928 "ConfigurationInterfaces.c"
 }
 
 
@@ -4928,7 +4938,7 @@ gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self);
-#line 4927 "ConfigurationInterfaces.c"
+#line 4937 "ConfigurationInterfaces.c"
 }
 
 
@@ -4952,8 +4962,8 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4951 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+#line 4961 "ConfigurationInterfaces.c"
+				goto __catch115_configuration_error;
 			}
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4961,11 +4971,11 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4960 "ConfigurationInterfaces.c"
+#line 4970 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4979,9 +4989,9 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4978 "ConfigurationInterfaces.c"
+#line 4988 "ConfigurationInterfaces.c"
 	}
-	__finally114:
+	__finally115:
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4990,7 +5000,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4989 "ConfigurationInterfaces.c"
+#line 4999 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5000,7 +5010,7 @@ void configuration_facade_set_display_photo_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display);
-#line 4999 "ConfigurationInterfaces.c"
+#line 5009 "ConfigurationInterfaces.c"
 }
 
 
@@ -5029,8 +5039,8 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5028 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5038 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5038,16 +5048,16 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5037 "ConfigurationInterfaces.c"
+#line 5047 "ConfigurationInterfaces.c"
 		}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5043 "ConfigurationInterfaces.c"
+#line 5053 "ConfigurationInterfaces.c"
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5065,16 +5075,16 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		_g_error_free0 (err);
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5064 "ConfigurationInterfaces.c"
+#line 5074 "ConfigurationInterfaces.c"
 	}
-	__finally115:
+	__finally116:
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5073 "ConfigurationInterfaces.c"
+#line 5083 "ConfigurationInterfaces.c"
 }
 
 
@@ -5083,7 +5093,7 @@ gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self);
-#line 5082 "ConfigurationInterfaces.c"
+#line 5092 "ConfigurationInterfaces.c"
 }
 
 
@@ -5107,8 +5117,8 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5106 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5116 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5116,11 +5126,11 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5115 "ConfigurationInterfaces.c"
+#line 5125 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5134,9 +5144,9 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5133 "ConfigurationInterfaces.c"
+#line 5143 "ConfigurationInterfaces.c"
 	}
-	__finally116:
+	__finally117:
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5145,7 +5155,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5144 "ConfigurationInterfaces.c"
+#line 5154 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5155,7 +5165,7 @@ void configuration_facade_set_display_event_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display);
-#line 5154 "ConfigurationInterfaces.c"
+#line 5164 "ConfigurationInterfaces.c"
 }
 
 
@@ -5167,7 +5177,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 	_vala_sort_order = FALSE;
 #line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 5166 "ConfigurationInterfaces.c"
+#line 5176 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5195,8 +5205,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5194 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5204 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5204,7 +5214,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5203 "ConfigurationInterfaces.c"
+#line 5213 "ConfigurationInterfaces.c"
 		}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -5224,8 +5234,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5223 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5233 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5233,14 +5243,14 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5232 "ConfigurationInterfaces.c"
+#line 5242 "ConfigurationInterfaces.c"
 		}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5236 "ConfigurationInterfaces.c"
+#line 5246 "ConfigurationInterfaces.c"
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5254,9 +5264,9 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5253 "ConfigurationInterfaces.c"
+#line 5263 "ConfigurationInterfaces.c"
 	}
-	__finally117:
+	__finally118:
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5265,19 +5275,19 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5264 "ConfigurationInterfaces.c"
+#line 5274 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 5270 "ConfigurationInterfaces.c"
+#line 5280 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 5276 "ConfigurationInterfaces.c"
+#line 5286 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5287,7 +5297,7 @@ void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by);
-#line 5286 "ConfigurationInterfaces.c"
+#line 5296 "ConfigurationInterfaces.c"
 }
 
 
@@ -5314,8 +5324,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5313 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5323 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5323,7 +5333,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5322 "ConfigurationInterfaces.c"
+#line 5332 "ConfigurationInterfaces.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -5339,8 +5349,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5338 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5348 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5348,11 +5358,11 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5347 "ConfigurationInterfaces.c"
+#line 5357 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5366,9 +5376,9 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5365 "ConfigurationInterfaces.c"
+#line 5375 "ConfigurationInterfaces.c"
 	}
-	__finally118:
+	__finally119:
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5377,7 +5387,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5376 "ConfigurationInterfaces.c"
+#line 5386 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5387,7 +5397,7 @@ void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by);
-#line 5386 "ConfigurationInterfaces.c"
+#line 5396 "ConfigurationInterfaces.c"
 }
 
 
@@ -5416,8 +5426,8 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5415 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5425 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5425,16 +5435,16 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 			g_clear_error (&_inner_error_);
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5424 "ConfigurationInterfaces.c"
+#line 5434 "ConfigurationInterfaces.c"
 		}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5430 "ConfigurationInterfaces.c"
+#line 5440 "ConfigurationInterfaces.c"
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5452,16 +5462,16 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		_g_error_free0 (err);
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5451 "ConfigurationInterfaces.c"
+#line 5461 "ConfigurationInterfaces.c"
 	}
-	__finally119:
+	__finally120:
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5460 "ConfigurationInterfaces.c"
+#line 5470 "ConfigurationInterfaces.c"
 }
 
 
@@ -5470,7 +5480,7 @@ gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self);
-#line 5469 "ConfigurationInterfaces.c"
+#line 5479 "ConfigurationInterfaces.c"
 }
 
 
@@ -5494,8 +5504,8 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5493 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5503 "ConfigurationInterfaces.c"
+				goto __catch121_configuration_error;
 			}
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5503,11 +5513,11 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5502 "ConfigurationInterfaces.c"
+#line 5512 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5523,9 +5533,9 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		_g_error_free0 (err);
 #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5522 "ConfigurationInterfaces.c"
+#line 5532 "ConfigurationInterfaces.c"
 	}
-	__finally120:
+	__finally121:
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5534,7 +5544,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5533 "ConfigurationInterfaces.c"
+#line 5543 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5544,7 +5554,7 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort);
-#line 5543 "ConfigurationInterfaces.c"
+#line 5553 "ConfigurationInterfaces.c"
 }
 
 
@@ -5574,8 +5584,8 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5573 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+#line 5583 "ConfigurationInterfaces.c"
+				goto __catch122_configuration_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5583,7 +5593,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5582 "ConfigurationInterfaces.c"
+#line 5592 "ConfigurationInterfaces.c"
 		}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5595,10 +5605,10 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5594 "ConfigurationInterfaces.c"
+#line 5604 "ConfigurationInterfaces.c"
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5619,16 +5629,16 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_error_free0 (err);
 #line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5618 "ConfigurationInterfaces.c"
+#line 5628 "ConfigurationInterfaces.c"
 	}
-	__finally121:
+	__finally122:
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5627 "ConfigurationInterfaces.c"
+#line 5637 "ConfigurationInterfaces.c"
 }
 
 
@@ -5637,7 +5647,7 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self);
-#line 5636 "ConfigurationInterfaces.c"
+#line 5646 "ConfigurationInterfaces.c"
 }
 
 
@@ -5645,7 +5655,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_photo_app != NULL);
-#line 5644 "ConfigurationInterfaces.c"
+#line 5654 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5664,8 +5674,8 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5663 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+#line 5673 "ConfigurationInterfaces.c"
+				goto __catch123_configuration_error;
 			}
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5673,11 +5683,11 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5672 "ConfigurationInterfaces.c"
+#line 5682 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5693,9 +5703,9 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5692 "ConfigurationInterfaces.c"
+#line 5702 "ConfigurationInterfaces.c"
 	}
-	__finally122:
+	__finally123:
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5704,7 +5714,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5703 "ConfigurationInterfaces.c"
+#line 5713 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5714,7 +5724,7 @@ void configuration_facade_set_external_photo_app (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app);
-#line 5713 "ConfigurationInterfaces.c"
+#line 5723 "ConfigurationInterfaces.c"
 }
 
 
@@ -5744,8 +5754,8 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5743 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+#line 5753 "ConfigurationInterfaces.c"
+				goto __catch124_configuration_error;
 			}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5753,7 +5763,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5752 "ConfigurationInterfaces.c"
+#line 5762 "ConfigurationInterfaces.c"
 		}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5765,10 +5775,10 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_free0 (_tmp0_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5764 "ConfigurationInterfaces.c"
+#line 5774 "ConfigurationInterfaces.c"
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally124;
+	__catch124_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5789,16 +5799,16 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5788 "ConfigurationInterfaces.c"
+#line 5798 "ConfigurationInterfaces.c"
 	}
-	__finally123:
+	__finally124:
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5797 "ConfigurationInterfaces.c"
+#line 5807 "ConfigurationInterfaces.c"
 }
 
 
@@ -5807,7 +5817,7 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self);
-#line 5806 "ConfigurationInterfaces.c"
+#line 5816 "ConfigurationInterfaces.c"
 }
 
 
@@ -5815,7 +5825,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_raw_app != NULL);
-#line 5814 "ConfigurationInterfaces.c"
+#line 5824 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5834,8 +5844,8 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5833 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+#line 5843 "ConfigurationInterfaces.c"
+				goto __catch125_configuration_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5843,11 +5853,11 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5842 "ConfigurationInterfaces.c"
+#line 5852 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally125;
+	__catch125_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5863,9 +5873,9 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5862 "ConfigurationInterfaces.c"
+#line 5872 "ConfigurationInterfaces.c"
 	}
-	__finally124:
+	__finally125:
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5874,7 +5884,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5873 "ConfigurationInterfaces.c"
+#line 5883 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5884,7 +5894,7 @@ void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app);
-#line 5883 "ConfigurationInterfaces.c"
+#line 5893 "ConfigurationInterfaces.c"
 }
 
 
@@ -5913,8 +5923,8 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5912 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+#line 5922 "ConfigurationInterfaces.c"
+				goto __catch126_configuration_error;
 			}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5922,16 +5932,16 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 			g_clear_error (&_inner_error_);
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 5921 "ConfigurationInterfaces.c"
+#line 5931 "ConfigurationInterfaces.c"
 		}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ScaleConstraint) _tmp0_;
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5927 "ConfigurationInterfaces.c"
+#line 5937 "ConfigurationInterfaces.c"
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally126;
+	__catch126_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5949,16 +5959,16 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		_g_error_free0 (err);
 #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5948 "ConfigurationInterfaces.c"
+#line 5958 "ConfigurationInterfaces.c"
 	}
-	__finally125:
+	__finally126:
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 5957 "ConfigurationInterfaces.c"
+#line 5967 "ConfigurationInterfaces.c"
 }
 
 
@@ -5967,7 +5977,7 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self);
-#line 5966 "ConfigurationInterfaces.c"
+#line 5976 "ConfigurationInterfaces.c"
 }
 
 
@@ -5991,8 +6001,8 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5990 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+#line 6000 "ConfigurationInterfaces.c"
+				goto __catch127_configuration_error;
 			}
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6000,11 +6010,11 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5999 "ConfigurationInterfaces.c"
+#line 6009 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally127;
+	__catch127_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6020,9 +6030,9 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		_g_error_free0 (err);
 #line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6019 "ConfigurationInterfaces.c"
+#line 6029 "ConfigurationInterfaces.c"
 	}
-	__finally126:
+	__finally127:
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6031,7 +6041,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6030 "ConfigurationInterfaces.c"
+#line 6040 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6041,7 +6051,7 @@ void configuration_facade_set_export_constraint (ConfigurationFacade* self, Scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint);
-#line 6040 "ConfigurationInterfaces.c"
+#line 6050 "ConfigurationInterfaces.c"
 }
 
 
@@ -6070,8 +6080,8 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6069 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+#line 6079 "ConfigurationInterfaces.c"
+				goto __catch128_configuration_error;
 			}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6079,16 +6089,16 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 			g_clear_error (&_inner_error_);
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6078 "ConfigurationInterfaces.c"
+#line 6088 "ConfigurationInterfaces.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ExportFormatMode) _tmp0_;
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6084 "ConfigurationInterfaces.c"
+#line 6094 "ConfigurationInterfaces.c"
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally128;
+	__catch128_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6106,16 +6116,16 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		_g_error_free0 (err);
 #line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6105 "ConfigurationInterfaces.c"
+#line 6115 "ConfigurationInterfaces.c"
 	}
-	__finally127:
+	__finally128:
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6114 "ConfigurationInterfaces.c"
+#line 6124 "ConfigurationInterfaces.c"
 }
 
 
@@ -6124,7 +6134,7 @@ ExportFormatMode configuration_facade_get_export_export_format_mode (Configurati
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self);
-#line 6123 "ConfigurationInterfaces.c"
+#line 6133 "ConfigurationInterfaces.c"
 }
 
 
@@ -6148,8 +6158,8 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6147 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+#line 6157 "ConfigurationInterfaces.c"
+				goto __catch129_configuration_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6157,11 +6167,11 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6156 "ConfigurationInterfaces.c"
+#line 6166 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally129;
+	__catch129_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6177,9 +6187,9 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		_g_error_free0 (err);
 #line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6176 "ConfigurationInterfaces.c"
+#line 6186 "ConfigurationInterfaces.c"
 	}
-	__finally128:
+	__finally129:
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6188,7 +6198,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		g_clear_error (&_inner_error_);
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6187 "ConfigurationInterfaces.c"
+#line 6197 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6198,7 +6208,7 @@ void configuration_facade_set_export_export_format_mode (ConfigurationFacade* se
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode);
-#line 6197 "ConfigurationInterfaces.c"
+#line 6207 "ConfigurationInterfaces.c"
 }
 
 
@@ -6227,8 +6237,8 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6226 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+#line 6236 "ConfigurationInterfaces.c"
+				goto __catch130_configuration_error;
 			}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6236,16 +6246,16 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 			g_clear_error (&_inner_error_);
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 6235 "ConfigurationInterfaces.c"
+#line 6245 "ConfigurationInterfaces.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6241 "ConfigurationInterfaces.c"
+#line 6251 "ConfigurationInterfaces.c"
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally130;
+	__catch130_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6263,16 +6273,16 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		_g_error_free0 (err);
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6262 "ConfigurationInterfaces.c"
+#line 6272 "ConfigurationInterfaces.c"
 	}
-	__finally129:
+	__finally130:
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 6271 "ConfigurationInterfaces.c"
+#line 6281 "ConfigurationInterfaces.c"
 }
 
 
@@ -6281,7 +6291,7 @@ gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self);
-#line 6280 "ConfigurationInterfaces.c"
+#line 6290 "ConfigurationInterfaces.c"
 }
 
 
@@ -6305,8 +6315,8 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6304 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+#line 6314 "ConfigurationInterfaces.c"
+				goto __catch131_configuration_error;
 			}
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6314,11 +6324,11 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6313 "ConfigurationInterfaces.c"
+#line 6323 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally131;
+	__catch131_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6334,9 +6344,9 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		_g_error_free0 (err);
 #line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6333 "ConfigurationInterfaces.c"
+#line 6343 "ConfigurationInterfaces.c"
 	}
-	__finally130:
+	__finally131:
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6345,7 +6355,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6344 "ConfigurationInterfaces.c"
+#line 6354 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6355,7 +6365,7 @@ void configuration_facade_set_export_export_metadata (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata);
-#line 6354 "ConfigurationInterfaces.c"
+#line 6364 "ConfigurationInterfaces.c"
 }
 
 
@@ -6385,8 +6395,8 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6384 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+#line 6394 "ConfigurationInterfaces.c"
+				goto __catch132_configuration_error;
 			}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6394,7 +6404,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 			g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6393 "ConfigurationInterfaces.c"
+#line 6403 "ConfigurationInterfaces.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = photo_file_format_unserialize (_tmp0_);
@@ -6402,10 +6412,10 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		result = _tmp5_;
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6401 "ConfigurationInterfaces.c"
+#line 6411 "ConfigurationInterfaces.c"
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally132;
+	__catch132_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6423,16 +6433,16 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		_g_error_free0 (err);
 #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6422 "ConfigurationInterfaces.c"
+#line 6432 "ConfigurationInterfaces.c"
 	}
-	__finally131:
+	__finally132:
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6431 "ConfigurationInterfaces.c"
+#line 6441 "ConfigurationInterfaces.c"
 }
 
 
@@ -6441,7 +6451,7 @@ PhotoFileFormat configuration_facade_get_export_photo_file_format (Configuration
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self);
-#line 6440 "ConfigurationInterfaces.c"
+#line 6450 "ConfigurationInterfaces.c"
 }
 
 
@@ -6468,8 +6478,8 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6467 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+#line 6477 "ConfigurationInterfaces.c"
+				goto __catch133_configuration_error;
 			}
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6477,11 +6487,11 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 			g_clear_error (&_inner_error_);
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6476 "ConfigurationInterfaces.c"
+#line 6486 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally133;
+	__catch133_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6497,9 +6507,9 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6496 "ConfigurationInterfaces.c"
+#line 6506 "ConfigurationInterfaces.c"
 	}
-	__finally132:
+	__finally133:
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6508,7 +6518,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		g_clear_error (&_inner_error_);
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6507 "ConfigurationInterfaces.c"
+#line 6517 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6518,7 +6528,7 @@ void configuration_facade_set_export_photo_file_format (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format);
-#line 6517 "ConfigurationInterfaces.c"
+#line 6527 "ConfigurationInterfaces.c"
 }
 
 
@@ -6547,8 +6557,8 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6546 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+#line 6556 "ConfigurationInterfaces.c"
+				goto __catch134_configuration_error;
 			}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6556,16 +6566,16 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6555 "ConfigurationInterfaces.c"
+#line 6565 "ConfigurationInterfaces.c"
 		}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (JpegQuality) _tmp0_;
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6561 "ConfigurationInterfaces.c"
+#line 6571 "ConfigurationInterfaces.c"
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally134;
+	__catch134_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6583,16 +6593,16 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		_g_error_free0 (err);
 #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6582 "ConfigurationInterfaces.c"
+#line 6592 "ConfigurationInterfaces.c"
 	}
-	__finally133:
+	__finally134:
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6591 "ConfigurationInterfaces.c"
+#line 6601 "ConfigurationInterfaces.c"
 }
 
 
@@ -6601,7 +6611,7 @@ JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self);
-#line 6600 "ConfigurationInterfaces.c"
+#line 6610 "ConfigurationInterfaces.c"
 }
 
 
@@ -6625,8 +6635,8 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6624 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+#line 6634 "ConfigurationInterfaces.c"
+				goto __catch135_configuration_error;
 			}
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6634,11 +6644,11 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 			g_clear_error (&_inner_error_);
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6633 "ConfigurationInterfaces.c"
+#line 6643 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally135;
+	__catch135_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6654,9 +6664,9 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		_g_error_free0 (err);
 #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6653 "ConfigurationInterfaces.c"
+#line 6663 "ConfigurationInterfaces.c"
 	}
-	__finally134:
+	__finally135:
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6665,7 +6675,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		g_clear_error (&_inner_error_);
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6664 "ConfigurationInterfaces.c"
+#line 6674 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6675,7 +6685,7 @@ void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQua
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality);
-#line 6674 "ConfigurationInterfaces.c"
+#line 6684 "ConfigurationInterfaces.c"
 }
 
 
@@ -6704,8 +6714,8 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6703 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+#line 6713 "ConfigurationInterfaces.c"
+				goto __catch136_configuration_error;
 			}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6713,16 +6723,16 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6712 "ConfigurationInterfaces.c"
+#line 6722 "ConfigurationInterfaces.c"
 		}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6718 "ConfigurationInterfaces.c"
+#line 6728 "ConfigurationInterfaces.c"
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6740,16 +6750,16 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6739 "ConfigurationInterfaces.c"
+#line 6749 "ConfigurationInterfaces.c"
 	}
-	__finally135:
+	__finally136:
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6748 "ConfigurationInterfaces.c"
+#line 6758 "ConfigurationInterfaces.c"
 }
 
 
@@ -6758,7 +6768,7 @@ gint configuration_facade_get_export_scale (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self);
-#line 6757 "ConfigurationInterfaces.c"
+#line 6767 "ConfigurationInterfaces.c"
 }
 
 
@@ -6782,8 +6792,8 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6781 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+#line 6791 "ConfigurationInterfaces.c"
+				goto __catch137_configuration_error;
 			}
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6791,11 +6801,11 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6790 "ConfigurationInterfaces.c"
+#line 6800 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6811,9 +6821,9 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6810 "ConfigurationInterfaces.c"
+#line 6820 "ConfigurationInterfaces.c"
 	}
-	__finally136:
+	__finally137:
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6822,7 +6832,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		g_clear_error (&_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6821 "ConfigurationInterfaces.c"
+#line 6831 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6832,7 +6842,7 @@ void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale);
-#line 6831 "ConfigurationInterfaces.c"
+#line 6841 "ConfigurationInterfaces.c"
 }
 
 
@@ -6862,8 +6872,8 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6861 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+#line 6871 "ConfigurationInterfaces.c"
+				goto __catch138_configuration_error;
 			}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6871,7 +6881,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 			g_clear_error (&_inner_error_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6870 "ConfigurationInterfaces.c"
+#line 6880 "ConfigurationInterfaces.c"
 		}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
@@ -6881,10 +6891,10 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_free0 (_tmp0_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6880 "ConfigurationInterfaces.c"
+#line 6890 "ConfigurationInterfaces.c"
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6902,16 +6912,16 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_error_free0 (err);
 #line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6901 "ConfigurationInterfaces.c"
+#line 6911 "ConfigurationInterfaces.c"
 	}
-	__finally137:
+	__finally138:
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6910 "ConfigurationInterfaces.c"
+#line 6920 "ConfigurationInterfaces.c"
 }
 
 
@@ -6920,7 +6930,7 @@ RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self);
-#line 6919 "ConfigurationInterfaces.c"
+#line 6929 "ConfigurationInterfaces.c"
 }
 
 
@@ -6952,8 +6962,8 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6951 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+#line 6961 "ConfigurationInterfaces.c"
+				goto __catch139_configuration_error;
 			}
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6961,11 +6971,11 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6960 "ConfigurationInterfaces.c"
+#line 6970 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6981,9 +6991,9 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		_g_error_free0 (err);
 #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6980 "ConfigurationInterfaces.c"
+#line 6990 "ConfigurationInterfaces.c"
 	}
-	__finally138:
+	__finally139:
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6992,7 +7002,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6991 "ConfigurationInterfaces.c"
+#line 7001 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7002,7 +7012,7 @@ void configuration_facade_set_default_raw_developer (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d);
-#line 7001 "ConfigurationInterfaces.c"
+#line 7011 "ConfigurationInterfaces.c"
 }
 
 
@@ -7031,8 +7041,8 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7030 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+#line 7040 "ConfigurationInterfaces.c"
+				goto __catch140_configuration_error;
 			}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7040,16 +7050,16 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7039 "ConfigurationInterfaces.c"
+#line 7049 "ConfigurationInterfaces.c"
 		}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7045 "ConfigurationInterfaces.c"
+#line 7055 "ConfigurationInterfaces.c"
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7067,16 +7077,16 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		_g_error_free0 (err);
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7066 "ConfigurationInterfaces.c"
+#line 7076 "ConfigurationInterfaces.c"
 	}
-	__finally139:
+	__finally140:
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7075 "ConfigurationInterfaces.c"
+#line 7085 "ConfigurationInterfaces.c"
 }
 
 
@@ -7085,7 +7095,7 @@ gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFac
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self);
-#line 7084 "ConfigurationInterfaces.c"
+#line 7094 "ConfigurationInterfaces.c"
 }
 
 
@@ -7109,8 +7119,8 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7108 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+#line 7118 "ConfigurationInterfaces.c"
+				goto __catch141_configuration_error;
 			}
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7118,11 +7128,11 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 			g_clear_error (&_inner_error_);
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7117 "ConfigurationInterfaces.c"
+#line 7127 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7136,9 +7146,9 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7135 "ConfigurationInterfaces.c"
+#line 7145 "ConfigurationInterfaces.c"
 	}
-	__finally140:
+	__finally141:
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7147,7 +7157,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7146 "ConfigurationInterfaces.c"
+#line 7156 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7157,7 +7167,7 @@ void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported);
-#line 7156 "ConfigurationInterfaces.c"
+#line 7166 "ConfigurationInterfaces.c"
 }
 
 
@@ -7187,8 +7197,8 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7186 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+#line 7196 "ConfigurationInterfaces.c"
+				goto __catch142_configuration_error;
 			}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7196,7 +7206,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7195 "ConfigurationInterfaces.c"
+#line 7205 "ConfigurationInterfaces.c"
 		}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -7208,10 +7218,10 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_free0 (_tmp0_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7207 "ConfigurationInterfaces.c"
+#line 7217 "ConfigurationInterfaces.c"
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7232,16 +7242,16 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7231 "ConfigurationInterfaces.c"
+#line 7241 "ConfigurationInterfaces.c"
 	}
-	__finally141:
+	__finally142:
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7240 "ConfigurationInterfaces.c"
+#line 7250 "ConfigurationInterfaces.c"
 }
 
 
@@ -7250,7 +7260,7 @@ gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self);
-#line 7249 "ConfigurationInterfaces.c"
+#line 7259 "ConfigurationInterfaces.c"
 }
 
 
@@ -7258,7 +7268,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 	GError * _inner_error_ = NULL;
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (import_dir != NULL);
-#line 7257 "ConfigurationInterfaces.c"
+#line 7267 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7277,8 +7287,8 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7276 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+#line 7286 "ConfigurationInterfaces.c"
+				goto __catch143_configuration_error;
 			}
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7286,11 +7296,11 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 			g_clear_error (&_inner_error_);
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7285 "ConfigurationInterfaces.c"
+#line 7295 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7304,9 +7314,9 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7303 "ConfigurationInterfaces.c"
+#line 7313 "ConfigurationInterfaces.c"
 	}
-	__finally142:
+	__finally143:
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7315,7 +7325,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		g_clear_error (&_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7314 "ConfigurationInterfaces.c"
+#line 7324 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7325,7 +7335,7 @@ void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir);
-#line 7324 "ConfigurationInterfaces.c"
+#line 7334 "ConfigurationInterfaces.c"
 }
 
 
@@ -7354,8 +7364,8 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7353 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 7363 "ConfigurationInterfaces.c"
+				goto __catch144_configuration_error;
 			}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7363,16 +7373,16 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7362 "ConfigurationInterfaces.c"
+#line 7372 "ConfigurationInterfaces.c"
 		}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7368 "ConfigurationInterfaces.c"
+#line 7378 "ConfigurationInterfaces.c"
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7390,16 +7400,16 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7389 "ConfigurationInterfaces.c"
+#line 7399 "ConfigurationInterfaces.c"
 	}
-	__finally143:
+	__finally144:
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7398 "ConfigurationInterfaces.c"
+#line 7408 "ConfigurationInterfaces.c"
 }
 
 
@@ -7408,7 +7418,7 @@ gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self);
-#line 7407 "ConfigurationInterfaces.c"
+#line 7417 "ConfigurationInterfaces.c"
 }
 
 
@@ -7432,8 +7442,8 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7431 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 7441 "ConfigurationInterfaces.c"
+				goto __catch145_configuration_error;
 			}
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7441,11 +7451,11 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7440 "ConfigurationInterfaces.c"
+#line 7450 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7459,9 +7469,9 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7458 "ConfigurationInterfaces.c"
+#line 7468 "ConfigurationInterfaces.c"
 	}
-	__finally144:
+	__finally145:
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7470,7 +7480,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7469 "ConfigurationInterfaces.c"
+#line 7479 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7480,7 +7490,7 @@ void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity);
-#line 7479 "ConfigurationInterfaces.c"
+#line 7489 "ConfigurationInterfaces.c"
 }
 
 
@@ -7509,8 +7519,8 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7508 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 7518 "ConfigurationInterfaces.c"
+				goto __catch146_configuration_error;
 			}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7518,16 +7528,16 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7517 "ConfigurationInterfaces.c"
+#line 7527 "ConfigurationInterfaces.c"
 		}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7523 "ConfigurationInterfaces.c"
+#line 7533 "ConfigurationInterfaces.c"
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7545,16 +7555,16 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		_g_error_free0 (err);
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7544 "ConfigurationInterfaces.c"
+#line 7554 "ConfigurationInterfaces.c"
 	}
-	__finally145:
+	__finally146:
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7553 "ConfigurationInterfaces.c"
+#line 7563 "ConfigurationInterfaces.c"
 }
 
 
@@ -7563,7 +7573,7 @@ gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self);
-#line 7562 "ConfigurationInterfaces.c"
+#line 7572 "ConfigurationInterfaces.c"
 }
 
 
@@ -7587,8 +7597,8 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7586 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 7596 "ConfigurationInterfaces.c"
+				goto __catch147_configuration_error;
 			}
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7596,11 +7606,11 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7595 "ConfigurationInterfaces.c"
+#line 7605 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7614,9 +7624,9 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7613 "ConfigurationInterfaces.c"
+#line 7623 "ConfigurationInterfaces.c"
 	}
-	__finally146:
+	__finally147:
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7625,7 +7635,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7624 "ConfigurationInterfaces.c"
+#line 7634 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7635,7 +7645,7 @@ void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state);
-#line 7634 "ConfigurationInterfaces.c"
+#line 7644 "ConfigurationInterfaces.c"
 }
 
 
@@ -7664,8 +7674,8 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7663 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+#line 7673 "ConfigurationInterfaces.c"
+				goto __catch148_configuration_error;
 			}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7673,16 +7683,16 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7672 "ConfigurationInterfaces.c"
+#line 7682 "ConfigurationInterfaces.c"
 		}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7678 "ConfigurationInterfaces.c"
+#line 7688 "ConfigurationInterfaces.c"
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7700,16 +7710,16 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7699 "ConfigurationInterfaces.c"
+#line 7709 "ConfigurationInterfaces.c"
 	}
-	__finally147:
+	__finally148:
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 7708 "ConfigurationInterfaces.c"
+#line 7718 "ConfigurationInterfaces.c"
 }
 
 
@@ -7718,7 +7728,7 @@ gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self);
-#line 7717 "ConfigurationInterfaces.c"
+#line 7727 "ConfigurationInterfaces.c"
 }
 
 
@@ -7742,8 +7752,8 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7741 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+#line 7751 "ConfigurationInterfaces.c"
+				goto __catch149_configuration_error;
 			}
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7751,11 +7761,11 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7750 "ConfigurationInterfaces.c"
+#line 7760 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7769,9 +7779,9 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7768 "ConfigurationInterfaces.c"
+#line 7778 "ConfigurationInterfaces.c"
 	}
-	__finally148:
+	__finally149:
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7780,7 +7790,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7779 "ConfigurationInterfaces.c"
+#line 7789 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7790,7 +7800,7 @@ void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice);
-#line 7789 "ConfigurationInterfaces.c"
+#line 7799 "ConfigurationInterfaces.c"
 }
 
 
@@ -7819,8 +7829,8 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7818 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+#line 7828 "ConfigurationInterfaces.c"
+				goto __catch150_configuration_error;
 			}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7828,16 +7838,16 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7827 "ConfigurationInterfaces.c"
+#line 7837 "ConfigurationInterfaces.c"
 		}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7833 "ConfigurationInterfaces.c"
+#line 7843 "ConfigurationInterfaces.c"
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7855,16 +7865,16 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		_g_error_free0 (err);
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7854 "ConfigurationInterfaces.c"
+#line 7864 "ConfigurationInterfaces.c"
 	}
-	__finally149:
+	__finally150:
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 7863 "ConfigurationInterfaces.c"
+#line 7873 "ConfigurationInterfaces.c"
 }
 
 
@@ -7873,7 +7883,7 @@ gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self);
-#line 7872 "ConfigurationInterfaces.c"
+#line 7882 "ConfigurationInterfaces.c"
 }
 
 
@@ -7897,8 +7907,8 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7896 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+#line 7906 "ConfigurationInterfaces.c"
+				goto __catch151_configuration_error;
 			}
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7906,11 +7916,11 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7905 "ConfigurationInterfaces.c"
+#line 7915 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7924,9 +7934,9 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7923 "ConfigurationInterfaces.c"
+#line 7933 "ConfigurationInterfaces.c"
 	}
-	__finally150:
+	__finally151:
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7935,7 +7945,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7934 "ConfigurationInterfaces.c"
+#line 7944 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7945,7 +7955,7 @@ void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice);
-#line 7944 "ConfigurationInterfaces.c"
+#line 7954 "ConfigurationInterfaces.c"
 }
 
 
@@ -7974,8 +7984,8 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7973 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+#line 7983 "ConfigurationInterfaces.c"
+				goto __catch152_configuration_error;
 			}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7983,16 +7993,16 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7982 "ConfigurationInterfaces.c"
+#line 7992 "ConfigurationInterfaces.c"
 		}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7988 "ConfigurationInterfaces.c"
+#line 7998 "ConfigurationInterfaces.c"
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -8010,16 +8020,16 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8009 "ConfigurationInterfaces.c"
+#line 8019 "ConfigurationInterfaces.c"
 	}
-	__finally151:
+	__finally152:
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8018 "ConfigurationInterfaces.c"
+#line 8028 "ConfigurationInterfaces.c"
 }
 
 
@@ -8028,7 +8038,7 @@ gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self);
-#line 8027 "ConfigurationInterfaces.c"
+#line 8037 "ConfigurationInterfaces.c"
 }
 
 
@@ -8052,8 +8062,8 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8051 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+#line 8061 "ConfigurationInterfaces.c"
+				goto __catch153_configuration_error;
 			}
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8061,11 +8071,11 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8060 "ConfigurationInterfaces.c"
+#line 8070 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8079,9 +8089,9 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8078 "ConfigurationInterfaces.c"
+#line 8088 "ConfigurationInterfaces.c"
 	}
-	__finally152:
+	__finally153:
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8090,7 +8100,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8089 "ConfigurationInterfaces.c"
+#line 8099 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8100,7 +8110,7 @@ void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint c
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice);
-#line 8099 "ConfigurationInterfaces.c"
+#line 8109 "ConfigurationInterfaces.c"
 }
 
 
@@ -8130,8 +8140,8 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8129 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+#line 8139 "ConfigurationInterfaces.c"
+				goto __catch154_configuration_error;
 			}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8139,7 +8149,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8138 "ConfigurationInterfaces.c"
+#line 8148 "ConfigurationInterfaces.c"
 		}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8151,10 +8161,10 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_free0 (_tmp0_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8150 "ConfigurationInterfaces.c"
+#line 8160 "ConfigurationInterfaces.c"
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8175,16 +8185,16 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8174 "ConfigurationInterfaces.c"
+#line 8184 "ConfigurationInterfaces.c"
 	}
-	__finally153:
+	__finally154:
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8183 "ConfigurationInterfaces.c"
+#line 8193 "ConfigurationInterfaces.c"
 }
 
 
@@ -8193,7 +8203,7 @@ gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self);
-#line 8192 "ConfigurationInterfaces.c"
+#line 8202 "ConfigurationInterfaces.c"
 }
 
 
@@ -8201,7 +8211,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 	GError * _inner_error_ = NULL;
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8200 "ConfigurationInterfaces.c"
+#line 8210 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8220,8 +8230,8 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8219 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+#line 8229 "ConfigurationInterfaces.c"
+				goto __catch155_configuration_error;
 			}
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8229,11 +8239,11 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8228 "ConfigurationInterfaces.c"
+#line 8238 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8247,9 +8257,9 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8246 "ConfigurationInterfaces.c"
+#line 8256 "ConfigurationInterfaces.c"
 	}
-	__finally154:
+	__finally155:
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8258,7 +8268,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8257 "ConfigurationInterfaces.c"
+#line 8267 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8268,7 +8278,7 @@ void configuration_facade_set_last_used_service (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name);
-#line 8267 "ConfigurationInterfaces.c"
+#line 8277 "ConfigurationInterfaces.c"
 }
 
 
@@ -8298,8 +8308,8 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8297 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+#line 8307 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8307,7 +8317,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 			g_clear_error (&_inner_error_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8306 "ConfigurationInterfaces.c"
+#line 8316 "ConfigurationInterfaces.c"
 		}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8319,10 +8329,10 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_free0 (_tmp0_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8318 "ConfigurationInterfaces.c"
+#line 8328 "ConfigurationInterfaces.c"
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8343,16 +8353,16 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_error_free0 (err);
 #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8342 "ConfigurationInterfaces.c"
+#line 8352 "ConfigurationInterfaces.c"
 	}
-	__finally155:
+	__finally156:
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8351 "ConfigurationInterfaces.c"
+#line 8361 "ConfigurationInterfaces.c"
 }
 
 
@@ -8361,7 +8371,7 @@ gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self);
-#line 8360 "ConfigurationInterfaces.c"
+#line 8370 "ConfigurationInterfaces.c"
 }
 
 
@@ -8369,7 +8379,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 	GError * _inner_error_ = NULL;
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8368 "ConfigurationInterfaces.c"
+#line 8378 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8388,8 +8398,8 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8387 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+#line 8397 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8397,11 +8407,11 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 			g_clear_error (&_inner_error_);
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8396 "ConfigurationInterfaces.c"
+#line 8406 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8415,9 +8425,9 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8414 "ConfigurationInterfaces.c"
+#line 8424 "ConfigurationInterfaces.c"
 	}
-	__finally156:
+	__finally157:
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8426,7 +8436,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		g_clear_error (&_inner_error_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8425 "ConfigurationInterfaces.c"
+#line 8435 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8436,7 +8446,7 @@ void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name);
-#line 8435 "ConfigurationInterfaces.c"
+#line 8445 "ConfigurationInterfaces.c"
 }
 
 
@@ -8448,7 +8458,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 	_vala_sort_order = FALSE;
 #line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 8447 "ConfigurationInterfaces.c"
+#line 8457 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8476,8 +8486,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8475 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8485 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8485,7 +8495,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8484 "ConfigurationInterfaces.c"
+#line 8494 "ConfigurationInterfaces.c"
 		}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -8505,8 +8515,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8504 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8514 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8514,14 +8524,14 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8513 "ConfigurationInterfaces.c"
+#line 8523 "ConfigurationInterfaces.c"
 		}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 8517 "ConfigurationInterfaces.c"
+#line 8527 "ConfigurationInterfaces.c"
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -8535,9 +8545,9 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8534 "ConfigurationInterfaces.c"
+#line 8544 "ConfigurationInterfaces.c"
 	}
-	__finally157:
+	__finally158:
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8546,19 +8556,19 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8545 "ConfigurationInterfaces.c"
+#line 8555 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 8551 "ConfigurationInterfaces.c"
+#line 8561 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 8557 "ConfigurationInterfaces.c"
+#line 8567 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8568,7 +8578,7 @@ void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by);
-#line 8567 "ConfigurationInterfaces.c"
+#line 8577 "ConfigurationInterfaces.c"
 }
 
 
@@ -8595,8 +8605,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8594 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8604 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8604,7 +8614,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8603 "ConfigurationInterfaces.c"
+#line 8613 "ConfigurationInterfaces.c"
 		}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8620,8 +8630,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8619 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8629 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8629,11 +8639,11 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8628 "ConfigurationInterfaces.c"
+#line 8638 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8647,9 +8657,9 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8646 "ConfigurationInterfaces.c"
+#line 8656 "ConfigurationInterfaces.c"
 	}
-	__finally158:
+	__finally159:
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8658,7 +8668,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8657 "ConfigurationInterfaces.c"
+#line 8667 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8668,7 +8678,7 @@ void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by);
-#line 8667 "ConfigurationInterfaces.c"
+#line 8677 "ConfigurationInterfaces.c"
 }
 
 
@@ -8680,7 +8690,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 	_vala_maximize = FALSE;
 #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 8679 "ConfigurationInterfaces.c"
+#line 8689 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8715,8 +8725,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8714 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8724 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8724,7 +8734,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8723 "ConfigurationInterfaces.c"
+#line 8733 "ConfigurationInterfaces.c"
 		}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -8744,8 +8754,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8743 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8753 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8753,7 +8763,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8752 "ConfigurationInterfaces.c"
+#line 8762 "ConfigurationInterfaces.c"
 		}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -8771,8 +8781,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8770 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8780 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8780,7 +8790,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8779 "ConfigurationInterfaces.c"
+#line 8789 "ConfigurationInterfaces.c"
 		}
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -8788,10 +8798,10 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		_tmp14_ = h;
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 8787 "ConfigurationInterfaces.c"
+#line 8797 "ConfigurationInterfaces.c"
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -8805,9 +8815,9 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8804 "ConfigurationInterfaces.c"
+#line 8814 "ConfigurationInterfaces.c"
 	}
-	__finally159:
+	__finally160:
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8816,19 +8826,19 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8815 "ConfigurationInterfaces.c"
+#line 8825 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 8821 "ConfigurationInterfaces.c"
+#line 8831 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 8827 "ConfigurationInterfaces.c"
+#line 8837 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8838,7 +8848,7 @@ void configuration_facade_get_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions);
-#line 8837 "ConfigurationInterfaces.c"
+#line 8847 "ConfigurationInterfaces.c"
 }
 
 
@@ -8846,7 +8856,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 	GError * _inner_error_ = NULL;
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 8845 "ConfigurationInterfaces.c"
+#line 8855 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8873,8 +8883,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8872 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8882 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8882,7 +8892,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8881 "ConfigurationInterfaces.c"
+#line 8891 "ConfigurationInterfaces.c"
 		}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8900,8 +8910,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8899 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8909 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8909,7 +8919,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8908 "ConfigurationInterfaces.c"
+#line 8918 "ConfigurationInterfaces.c"
 		}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -8927,8 +8937,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8926 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8936 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8936,11 +8946,11 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8935 "ConfigurationInterfaces.c"
+#line 8945 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -8954,9 +8964,9 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8953 "ConfigurationInterfaces.c"
+#line 8963 "ConfigurationInterfaces.c"
 	}
-	__finally160:
+	__finally161:
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8965,7 +8975,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8964 "ConfigurationInterfaces.c"
+#line 8974 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8975,7 +8985,7 @@ void configuration_facade_set_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions);
-#line 8974 "ConfigurationInterfaces.c"
+#line 8984 "ConfigurationInterfaces.c"
 }
 
 
@@ -9004,8 +9014,8 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9003 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9013 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9013,16 +9023,16 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 9012 "ConfigurationInterfaces.c"
+#line 9022 "ConfigurationInterfaces.c"
 		}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9018 "ConfigurationInterfaces.c"
+#line 9028 "ConfigurationInterfaces.c"
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9040,16 +9050,16 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		_g_error_free0 (err);
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9039 "ConfigurationInterfaces.c"
+#line 9049 "ConfigurationInterfaces.c"
 	}
-	__finally161:
+	__finally162:
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 9048 "ConfigurationInterfaces.c"
+#line 9058 "ConfigurationInterfaces.c"
 }
 
 
@@ -9058,7 +9068,7 @@ gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self);
-#line 9057 "ConfigurationInterfaces.c"
+#line 9067 "ConfigurationInterfaces.c"
 }
 
 
@@ -9082,8 +9092,8 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9081 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9091 "ConfigurationInterfaces.c"
+				goto __catch163_configuration_error;
 			}
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9091,11 +9101,11 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9090 "ConfigurationInterfaces.c"
+#line 9100 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9109,9 +9119,9 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9108 "ConfigurationInterfaces.c"
+#line 9118 "ConfigurationInterfaces.c"
 	}
-	__finally162:
+	__finally163:
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9120,7 +9130,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9119 "ConfigurationInterfaces.c"
+#line 9129 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9130,7 +9140,7 @@ void configuration_facade_set_modify_originals (ConfigurationFacade* self, gbool
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals);
-#line 9129 "ConfigurationInterfaces.c"
+#line 9139 "ConfigurationInterfaces.c"
 }
 
 
@@ -9159,8 +9169,8 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9158 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+#line 9168 "ConfigurationInterfaces.c"
+				goto __catch164_configuration_error;
 			}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9168,16 +9178,16 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9167 "ConfigurationInterfaces.c"
+#line 9177 "ConfigurationInterfaces.c"
 		}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9173 "ConfigurationInterfaces.c"
+#line 9183 "ConfigurationInterfaces.c"
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9201,16 +9211,16 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		_g_error_free0 (err);
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9200 "ConfigurationInterfaces.c"
+#line 9210 "ConfigurationInterfaces.c"
 	}
-	__finally163:
+	__finally164:
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9209 "ConfigurationInterfaces.c"
+#line 9219 "ConfigurationInterfaces.c"
 }
 
 
@@ -9219,7 +9229,7 @@ gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self);
-#line 9218 "ConfigurationInterfaces.c"
+#line 9228 "ConfigurationInterfaces.c"
 }
 
 
@@ -9243,8 +9253,8 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9242 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+#line 9252 "ConfigurationInterfaces.c"
+				goto __catch165_configuration_error;
 			}
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9252,11 +9262,11 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9251 "ConfigurationInterfaces.c"
+#line 9261 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9270,9 +9280,9 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9269 "ConfigurationInterfaces.c"
+#line 9279 "ConfigurationInterfaces.c"
 	}
-	__finally164:
+	__finally165:
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9281,7 +9291,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9280 "ConfigurationInterfaces.c"
+#line 9290 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9291,7 +9301,7 @@ void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale);
-#line 9290 "ConfigurationInterfaces.c"
+#line 9300 "ConfigurationInterfaces.c"
 }
 
 
@@ -9320,8 +9330,8 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9319 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+#line 9329 "ConfigurationInterfaces.c"
+				goto __catch166_configuration_error;
 			}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9329,16 +9339,16 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 			g_clear_error (&_inner_error_);
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 9328 "ConfigurationInterfaces.c"
+#line 9338 "ConfigurationInterfaces.c"
 		}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9334 "ConfigurationInterfaces.c"
+#line 9344 "ConfigurationInterfaces.c"
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9356,16 +9366,16 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		_g_error_free0 (err);
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9355 "ConfigurationInterfaces.c"
+#line 9365 "ConfigurationInterfaces.c"
 	}
-	__finally165:
+	__finally166:
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 9364 "ConfigurationInterfaces.c"
+#line 9374 "ConfigurationInterfaces.c"
 }
 
 
@@ -9374,7 +9384,7 @@ gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self);
-#line 9373 "ConfigurationInterfaces.c"
+#line 9383 "ConfigurationInterfaces.c"
 }
 
 
@@ -9398,8 +9408,8 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9397 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+#line 9407 "ConfigurationInterfaces.c"
+				goto __catch167_configuration_error;
 			}
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9407,11 +9417,11 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 			g_clear_error (&_inner_error_);
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9406 "ConfigurationInterfaces.c"
+#line 9416 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9425,9 +9435,9 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9424 "ConfigurationInterfaces.c"
+#line 9434 "ConfigurationInterfaces.c"
 	}
-	__finally166:
+	__finally167:
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9436,7 +9446,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		g_clear_error (&_inner_error_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9435 "ConfigurationInterfaces.c"
+#line 9445 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9446,7 +9456,7 @@ void configuration_facade_set_printing_content_height (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height);
-#line 9445 "ConfigurationInterfaces.c"
+#line 9455 "ConfigurationInterfaces.c"
 }
 
 
@@ -9475,8 +9485,8 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9474 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+#line 9484 "ConfigurationInterfaces.c"
+				goto __catch168_configuration_error;
 			}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9484,16 +9494,16 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9483 "ConfigurationInterfaces.c"
+#line 9493 "ConfigurationInterfaces.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9489 "ConfigurationInterfaces.c"
+#line 9499 "ConfigurationInterfaces.c"
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9511,16 +9521,16 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		_g_error_free0 (err);
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9510 "ConfigurationInterfaces.c"
+#line 9520 "ConfigurationInterfaces.c"
 	}
-	__finally167:
+	__finally168:
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9519 "ConfigurationInterfaces.c"
+#line 9529 "ConfigurationInterfaces.c"
 }
 
 
@@ -9529,7 +9539,7 @@ gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self);
-#line 9528 "ConfigurationInterfaces.c"
+#line 9538 "ConfigurationInterfaces.c"
 }
 
 
@@ -9553,8 +9563,8 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9552 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+#line 9562 "ConfigurationInterfaces.c"
+				goto __catch169_configuration_error;
 			}
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9562,11 +9572,11 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9561 "ConfigurationInterfaces.c"
+#line 9571 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9580,9 +9590,9 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9579 "ConfigurationInterfaces.c"
+#line 9589 "ConfigurationInterfaces.c"
 	}
-	__finally168:
+	__finally169:
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9591,7 +9601,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		g_clear_error (&_inner_error_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9590 "ConfigurationInterfaces.c"
+#line 9600 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9601,7 +9611,7 @@ void configuration_facade_set_printing_content_layout (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code);
-#line 9600 "ConfigurationInterfaces.c"
+#line 9610 "ConfigurationInterfaces.c"
 }
 
 
@@ -9630,8 +9640,8 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9629 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+#line 9639 "ConfigurationInterfaces.c"
+				goto __catch170_configuration_error;
 			}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9639,16 +9649,16 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9638 "ConfigurationInterfaces.c"
+#line 9648 "ConfigurationInterfaces.c"
 		}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9644 "ConfigurationInterfaces.c"
+#line 9654 "ConfigurationInterfaces.c"
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9666,16 +9676,16 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		_g_error_free0 (err);
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9665 "ConfigurationInterfaces.c"
+#line 9675 "ConfigurationInterfaces.c"
 	}
-	__finally169:
+	__finally170:
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9674 "ConfigurationInterfaces.c"
+#line 9684 "ConfigurationInterfaces.c"
 }
 
 
@@ -9684,7 +9694,7 @@ gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self);
-#line 9683 "ConfigurationInterfaces.c"
+#line 9693 "ConfigurationInterfaces.c"
 }
 
 
@@ -9708,8 +9718,8 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9707 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+#line 9717 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9717,11 +9727,11 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9716 "ConfigurationInterfaces.c"
+#line 9726 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9735,9 +9745,9 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9734 "ConfigurationInterfaces.c"
+#line 9744 "ConfigurationInterfaces.c"
 	}
-	__finally170:
+	__finally171:
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9746,7 +9756,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9745 "ConfigurationInterfaces.c"
+#line 9755 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9756,7 +9766,7 @@ void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi);
-#line 9755 "ConfigurationInterfaces.c"
+#line 9765 "ConfigurationInterfaces.c"
 }
 
 
@@ -9785,8 +9795,8 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9784 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+#line 9794 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9794,16 +9804,16 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9793 "ConfigurationInterfaces.c"
+#line 9803 "ConfigurationInterfaces.c"
 		}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9799 "ConfigurationInterfaces.c"
+#line 9809 "ConfigurationInterfaces.c"
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9821,16 +9831,16 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		_g_error_free0 (err);
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9820 "ConfigurationInterfaces.c"
+#line 9830 "ConfigurationInterfaces.c"
 	}
-	__finally171:
+	__finally172:
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9829 "ConfigurationInterfaces.c"
+#line 9839 "ConfigurationInterfaces.c"
 }
 
 
@@ -9839,7 +9849,7 @@ gint configuration_facade_get_printing_content_units (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self);
-#line 9838 "ConfigurationInterfaces.c"
+#line 9848 "ConfigurationInterfaces.c"
 }
 
 
@@ -9863,8 +9873,8 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9862 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+#line 9872 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9872,11 +9882,11 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9871 "ConfigurationInterfaces.c"
+#line 9881 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9890,9 +9900,9 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9889 "ConfigurationInterfaces.c"
+#line 9899 "ConfigurationInterfaces.c"
 	}
-	__finally172:
+	__finally173:
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9901,7 +9911,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9900 "ConfigurationInterfaces.c"
+#line 9910 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9911,7 +9921,7 @@ void configuration_facade_set_printing_content_units (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code);
-#line 9910 "ConfigurationInterfaces.c"
+#line 9920 "ConfigurationInterfaces.c"
 }
 
 
@@ -9940,8 +9950,8 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9939 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+#line 9949 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9949,16 +9959,16 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 			g_clear_error (&_inner_error_);
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 9948 "ConfigurationInterfaces.c"
+#line 9958 "ConfigurationInterfaces.c"
 		}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9954 "ConfigurationInterfaces.c"
+#line 9964 "ConfigurationInterfaces.c"
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9976,16 +9986,16 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		_g_error_free0 (err);
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9975 "ConfigurationInterfaces.c"
+#line 9985 "ConfigurationInterfaces.c"
 	}
-	__finally173:
+	__finally174:
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 9984 "ConfigurationInterfaces.c"
+#line 9994 "ConfigurationInterfaces.c"
 }
 
 
@@ -9994,7 +10004,7 @@ gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self);
-#line 9993 "ConfigurationInterfaces.c"
+#line 10003 "ConfigurationInterfaces.c"
 }
 
 
@@ -10018,8 +10028,8 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10017 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+#line 10027 "ConfigurationInterfaces.c"
+				goto __catch175_configuration_error;
 			}
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10027,11 +10037,11 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10026 "ConfigurationInterfaces.c"
+#line 10036 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10045,9 +10055,9 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10044 "ConfigurationInterfaces.c"
+#line 10054 "ConfigurationInterfaces.c"
 	}
-	__finally174:
+	__finally175:
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10056,7 +10066,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10055 "ConfigurationInterfaces.c"
+#line 10065 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10066,7 +10076,7 @@ void configuration_facade_set_printing_content_width (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width);
-#line 10065 "ConfigurationInterfaces.c"
+#line 10075 "ConfigurationInterfaces.c"
 }
 
 
@@ -10095,8 +10105,8 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10094 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+#line 10104 "ConfigurationInterfaces.c"
+				goto __catch176_configuration_error;
 			}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10104,16 +10114,16 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 10103 "ConfigurationInterfaces.c"
+#line 10113 "ConfigurationInterfaces.c"
 		}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10109 "ConfigurationInterfaces.c"
+#line 10119 "ConfigurationInterfaces.c"
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10131,16 +10141,16 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		_g_error_free0 (err);
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10130 "ConfigurationInterfaces.c"
+#line 10140 "ConfigurationInterfaces.c"
 	}
-	__finally175:
+	__finally176:
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 10139 "ConfigurationInterfaces.c"
+#line 10149 "ConfigurationInterfaces.c"
 }
 
 
@@ -10149,7 +10159,7 @@ gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self);
-#line 10148 "ConfigurationInterfaces.c"
+#line 10158 "ConfigurationInterfaces.c"
 }
 
 
@@ -10173,8 +10183,8 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10172 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+#line 10182 "ConfigurationInterfaces.c"
+				goto __catch177_configuration_error;
 			}
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10182,11 +10192,11 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10181 "ConfigurationInterfaces.c"
+#line 10191 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10200,9 +10210,9 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10199 "ConfigurationInterfaces.c"
+#line 10209 "ConfigurationInterfaces.c"
 	}
-	__finally176:
+	__finally177:
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10211,7 +10221,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		g_clear_error (&_inner_error_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10210 "ConfigurationInterfaces.c"
+#line 10220 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10221,7 +10231,7 @@ void configuration_facade_set_printing_images_per_page (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code);
-#line 10220 "ConfigurationInterfaces.c"
+#line 10230 "ConfigurationInterfaces.c"
 }
 
 
@@ -10250,8 +10260,8 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10249 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+#line 10259 "ConfigurationInterfaces.c"
+				goto __catch178_configuration_error;
 			}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10259,16 +10269,16 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 			g_clear_error (&_inner_error_);
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10258 "ConfigurationInterfaces.c"
+#line 10268 "ConfigurationInterfaces.c"
 		}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10264 "ConfigurationInterfaces.c"
+#line 10274 "ConfigurationInterfaces.c"
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10286,16 +10296,16 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		_g_error_free0 (err);
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10285 "ConfigurationInterfaces.c"
+#line 10295 "ConfigurationInterfaces.c"
 	}
-	__finally177:
+	__finally178:
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10294 "ConfigurationInterfaces.c"
+#line 10304 "ConfigurationInterfaces.c"
 }
 
 
@@ -10304,7 +10314,7 @@ gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self);
-#line 10303 "ConfigurationInterfaces.c"
+#line 10313 "ConfigurationInterfaces.c"
 }
 
 
@@ -10328,8 +10338,8 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10327 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+#line 10337 "ConfigurationInterfaces.c"
+				goto __catch179_configuration_error;
 			}
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10337,11 +10347,11 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 			g_clear_error (&_inner_error_);
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10336 "ConfigurationInterfaces.c"
+#line 10346 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10355,9 +10365,9 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10354 "ConfigurationInterfaces.c"
+#line 10364 "ConfigurationInterfaces.c"
 	}
-	__finally178:
+	__finally179:
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10366,7 +10376,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		g_clear_error (&_inner_error_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10365 "ConfigurationInterfaces.c"
+#line 10375 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10376,7 +10386,7 @@ void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio);
-#line 10375 "ConfigurationInterfaces.c"
+#line 10385 "ConfigurationInterfaces.c"
 }
 
 
@@ -10405,8 +10415,8 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10404 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+#line 10414 "ConfigurationInterfaces.c"
+				goto __catch180_configuration_error;
 			}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10414,16 +10424,16 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 			g_clear_error (&_inner_error_);
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10413 "ConfigurationInterfaces.c"
+#line 10423 "ConfigurationInterfaces.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10419 "ConfigurationInterfaces.c"
+#line 10429 "ConfigurationInterfaces.c"
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10441,16 +10451,16 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		_g_error_free0 (err);
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10440 "ConfigurationInterfaces.c"
+#line 10450 "ConfigurationInterfaces.c"
 	}
-	__finally179:
+	__finally180:
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10449 "ConfigurationInterfaces.c"
+#line 10459 "ConfigurationInterfaces.c"
 }
 
 
@@ -10459,7 +10469,7 @@ gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self);
-#line 10458 "ConfigurationInterfaces.c"
+#line 10468 "ConfigurationInterfaces.c"
 }
 
 
@@ -10483,8 +10493,8 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10482 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+#line 10492 "ConfigurationInterfaces.c"
+				goto __catch181_configuration_error;
 			}
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10492,11 +10502,11 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10491 "ConfigurationInterfaces.c"
+#line 10501 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10510,9 +10520,9 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10509 "ConfigurationInterfaces.c"
+#line 10519 "ConfigurationInterfaces.c"
 	}
-	__finally180:
+	__finally181:
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10521,7 +10531,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10520 "ConfigurationInterfaces.c"
+#line 10530 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10531,7 +10541,7 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles);
-#line 10530 "ConfigurationInterfaces.c"
+#line 10540 "ConfigurationInterfaces.c"
 }
 
 
@@ -10544,6 +10554,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
+		gint val = 0;
+		gint _tmp5_ = 0;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10560,8 +10572,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10559 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+#line 10571 "ConfigurationInterfaces.c"
+				goto __catch182_configuration_error;
 			}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10569,43 +10581,64 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 			g_clear_error (&_inner_error_);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 10568 "ConfigurationInterfaces.c"
+#line 10580 "ConfigurationInterfaces.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		result = _tmp0_ - 1;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		val = _tmp0_ - 1;
+#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = val;
+#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (_tmp5_ == -2) {
+#line 10588 "ConfigurationInterfaces.c"
+			ResourcesUnitSystem _tmp6_ = 0;
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp6_ = resources_get_default_measurement_unit ();
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_tmp6_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
+#line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+				val = 2;
+#line 10596 "ConfigurationInterfaces.c"
+			} else {
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+				val = 10;
+#line 10600 "ConfigurationInterfaces.c"
+			}
+		}
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = val;
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10574 "ConfigurationInterfaces.c"
+#line 10607 "ConfigurationInterfaces.c"
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp7_ = NULL;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp7_ = err;
+#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp7_);
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10595 "ConfigurationInterfaces.c"
+#line 10628 "ConfigurationInterfaces.c"
 	}
-	__finally181:
+	__finally182:
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 10604 "ConfigurationInterfaces.c"
+#line 10637 "ConfigurationInterfaces.c"
 }
 
 
@@ -10614,7 +10647,7 @@ gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self);
-#line 10613 "ConfigurationInterfaces.c"
+#line 10646 "ConfigurationInterfaces.c"
 }
 
 
@@ -10624,69 +10657,69 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = size_code;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, _tmp2_ + 1, &_inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10637 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+#line 10670 "ConfigurationInterfaces.c"
+				goto __catch183_configuration_error;
 			}
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10646 "ConfigurationInterfaces.c"
+#line 10679 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10664 "ConfigurationInterfaces.c"
+#line 10697 "ConfigurationInterfaces.c"
 	}
-	__finally182:
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally183:
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10675 "ConfigurationInterfaces.c"
+#line 10708 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code) {
-#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code);
-#line 10685 "ConfigurationInterfaces.c"
+#line 10718 "ConfigurationInterfaces.c"
 }
 
 
@@ -10700,161 +10733,161 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, &_inner_error_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10715 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+#line 10748 "ConfigurationInterfaces.c"
+				goto __catch184_configuration_error;
 			}
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 10724 "ConfigurationInterfaces.c"
+#line 10757 "ConfigurationInterfaces.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10736 "ConfigurationInterfaces.c"
+#line 10769 "ConfigurationInterfaces.c"
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("Sans Bold 12");
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10760 "ConfigurationInterfaces.c"
+#line 10793 "ConfigurationInterfaces.c"
 	}
-	__finally183:
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally184:
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10769 "ConfigurationInterfaces.c"
+#line 10802 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) {
-#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self);
-#line 10778 "ConfigurationInterfaces.c"
+#line 10811 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
 	GError * _inner_error_ = NULL;
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (font_name != NULL);
-#line 10786 "ConfigurationInterfaces.c"
+#line 10819 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = font_name;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, _tmp2_, &_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10805 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+#line 10838 "ConfigurationInterfaces.c"
+				goto __catch185_configuration_error;
 			}
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10814 "ConfigurationInterfaces.c"
+#line 10847 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10832 "ConfigurationInterfaces.c"
+#line 10865 "ConfigurationInterfaces.c"
 	}
-	__finally184:
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally185:
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10843 "ConfigurationInterfaces.c"
+#line 10876 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name);
-#line 10853 "ConfigurationInterfaces.c"
+#line 10886 "ConfigurationInterfaces.c"
 }
 
 
@@ -10867,77 +10900,77 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, &_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10882 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+#line 10915 "ConfigurationInterfaces.c"
+				goto __catch186_configuration_error;
 			}
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10891 "ConfigurationInterfaces.c"
+#line 10924 "ConfigurationInterfaces.c"
 		}
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10897 "ConfigurationInterfaces.c"
+#line 10930 "ConfigurationInterfaces.c"
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10918 "ConfigurationInterfaces.c"
+#line 10951 "ConfigurationInterfaces.c"
 	}
-	__finally185:
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally186:
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10927 "ConfigurationInterfaces.c"
+#line 10960 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) {
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self);
-#line 10936 "ConfigurationInterfaces.c"
+#line 10969 "ConfigurationInterfaces.c"
 }
 
 
@@ -10947,69 +10980,69 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, _tmp2_, &_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10960 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+#line 10993 "ConfigurationInterfaces.c"
+				goto __catch187_configuration_error;
 			}
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10969 "ConfigurationInterfaces.c"
+#line 11002 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10987 "ConfigurationInterfaces.c"
+#line 11020 "ConfigurationInterfaces.c"
 	}
-	__finally186:
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally187:
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10998 "ConfigurationInterfaces.c"
+#line 11031 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) {
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show);
-#line 11008 "ConfigurationInterfaces.c"
+#line 11041 "ConfigurationInterfaces.c"
 }
 
 
@@ -11022,77 +11055,77 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, &_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11037 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+#line 11070 "ConfigurationInterfaces.c"
+				goto __catch188_configuration_error;
 			}
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 11046 "ConfigurationInterfaces.c"
+#line 11079 "ConfigurationInterfaces.c"
 		}
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11052 "ConfigurationInterfaces.c"
+#line 11085 "ConfigurationInterfaces.c"
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 180;
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11073 "ConfigurationInterfaces.c"
+#line 11106 "ConfigurationInterfaces.c"
 	}
-	__finally187:
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally188:
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 11082 "ConfigurationInterfaces.c"
+#line 11115 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) {
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self);
-#line 11091 "ConfigurationInterfaces.c"
+#line 11124 "ConfigurationInterfaces.c"
 }
 
 
@@ -11102,69 +11135,69 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = position;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, _tmp2_, &_inner_error_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11115 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+#line 11148 "ConfigurationInterfaces.c"
+				goto __catch189_configuration_error;
 			}
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11124 "ConfigurationInterfaces.c"
+#line 11157 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11142 "ConfigurationInterfaces.c"
+#line 11175 "ConfigurationInterfaces.c"
 	}
-	__finally188:
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally189:
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11153 "ConfigurationInterfaces.c"
+#line 11186 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position) {
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position);
-#line 11163 "ConfigurationInterfaces.c"
+#line 11196 "ConfigurationInterfaces.c"
 }
 
 
@@ -11177,77 +11210,77 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, &_inner_error_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11192 "ConfigurationInterfaces.c"
-				goto __catch189_configuration_error;
+#line 11225 "ConfigurationInterfaces.c"
+				goto __catch190_configuration_error;
 			}
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 11201 "ConfigurationInterfaces.c"
+#line 11234 "ConfigurationInterfaces.c"
 		}
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11207 "ConfigurationInterfaces.c"
+#line 11240 "ConfigurationInterfaces.c"
 	}
-	goto __finally189;
-	__catch189_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 3.0;
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11228 "ConfigurationInterfaces.c"
+#line 11261 "ConfigurationInterfaces.c"
 	}
-	__finally189:
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally190:
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 11237 "ConfigurationInterfaces.c"
+#line 11270 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) {
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self);
-#line 11246 "ConfigurationInterfaces.c"
+#line 11279 "ConfigurationInterfaces.c"
 }
 
 
@@ -11257,69 +11290,69 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, _tmp2_, &_inner_error_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11270 "ConfigurationInterfaces.c"
-				goto __catch190_configuration_error;
+#line 11303 "ConfigurationInterfaces.c"
+				goto __catch191_configuration_error;
 			}
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11279 "ConfigurationInterfaces.c"
+#line 11312 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11297 "ConfigurationInterfaces.c"
+#line 11330 "ConfigurationInterfaces.c"
 	}
-	__finally190:
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally191:
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11308 "ConfigurationInterfaces.c"
+#line 11341 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay);
-#line 11318 "ConfigurationInterfaces.c"
+#line 11351 "ConfigurationInterfaces.c"
 }
 
 
@@ -11332,77 +11365,77 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, &_inner_error_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11347 "ConfigurationInterfaces.c"
-				goto __catch191_configuration_error;
+#line 11380 "ConfigurationInterfaces.c"
+				goto __catch192_configuration_error;
 			}
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 11356 "ConfigurationInterfaces.c"
+#line 11389 "ConfigurationInterfaces.c"
 		}
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11362 "ConfigurationInterfaces.c"
+#line 11395 "ConfigurationInterfaces.c"
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0.3;
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11383 "ConfigurationInterfaces.c"
+#line 11416 "ConfigurationInterfaces.c"
 	}
-	__finally191:
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally192:
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 11392 "ConfigurationInterfaces.c"
+#line 11425 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) {
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self);
-#line 11401 "ConfigurationInterfaces.c"
+#line 11434 "ConfigurationInterfaces.c"
 }
 
 
@@ -11412,69 +11445,69 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, _tmp2_, &_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11425 "ConfigurationInterfaces.c"
-				goto __catch192_configuration_error;
+#line 11458 "ConfigurationInterfaces.c"
+				goto __catch193_configuration_error;
 			}
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11434 "ConfigurationInterfaces.c"
+#line 11467 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11452 "ConfigurationInterfaces.c"
+#line 11485 "ConfigurationInterfaces.c"
 	}
-	__finally192:
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally193:
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11463 "ConfigurationInterfaces.c"
+#line 11496 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay);
-#line 11473 "ConfigurationInterfaces.c"
+#line 11506 "ConfigurationInterfaces.c"
 }
 
 
@@ -11488,161 +11521,161 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, &_inner_error_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11503 "ConfigurationInterfaces.c"
-				goto __catch193_configuration_error;
+#line 11536 "ConfigurationInterfaces.c"
+				goto __catch194_configuration_error;
 			}
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 11512 "ConfigurationInterfaces.c"
+#line 11545 "ConfigurationInterfaces.c"
 		}
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11524 "ConfigurationInterfaces.c"
+#line 11557 "ConfigurationInterfaces.c"
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11548 "ConfigurationInterfaces.c"
+#line 11581 "ConfigurationInterfaces.c"
 	}
-	__finally193:
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally194:
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 11557 "ConfigurationInterfaces.c"
+#line 11590 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) {
-#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self);
-#line 11566 "ConfigurationInterfaces.c"
+#line 11599 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
 	GError * _inner_error_ = NULL;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 11574 "ConfigurationInterfaces.c"
+#line 11607 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = id;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, _tmp2_, &_inner_error_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11593 "ConfigurationInterfaces.c"
-				goto __catch194_configuration_error;
+#line 11626 "ConfigurationInterfaces.c"
+				goto __catch195_configuration_error;
 			}
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11602 "ConfigurationInterfaces.c"
+#line 11635 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11620 "ConfigurationInterfaces.c"
+#line 11653 "ConfigurationInterfaces.c"
 	}
-	__finally194:
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally195:
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11631 "ConfigurationInterfaces.c"
+#line 11664 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id);
-#line 11641 "ConfigurationInterfaces.c"
+#line 11674 "ConfigurationInterfaces.c"
 }
 
 
@@ -11655,77 +11688,77 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, &_inner_error_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11670 "ConfigurationInterfaces.c"
-				goto __catch195_configuration_error;
+#line 11703 "ConfigurationInterfaces.c"
+				goto __catch196_configuration_error;
 			}
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 11679 "ConfigurationInterfaces.c"
+#line 11712 "ConfigurationInterfaces.c"
 		}
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11685 "ConfigurationInterfaces.c"
+#line 11718 "ConfigurationInterfaces.c"
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11706 "ConfigurationInterfaces.c"
+#line 11739 "ConfigurationInterfaces.c"
 	}
-	__finally195:
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally196:
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 11715 "ConfigurationInterfaces.c"
+#line 11748 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) {
-#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self);
-#line 11724 "ConfigurationInterfaces.c"
+#line 11757 "ConfigurationInterfaces.c"
 }
 
 
@@ -11735,69 +11768,69 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show_title;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, _tmp2_, &_inner_error_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11748 "ConfigurationInterfaces.c"
-				goto __catch196_configuration_error;
+#line 11781 "ConfigurationInterfaces.c"
+				goto __catch197_configuration_error;
 			}
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11757 "ConfigurationInterfaces.c"
+#line 11790 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11775 "ConfigurationInterfaces.c"
+#line 11808 "ConfigurationInterfaces.c"
 	}
-	__finally196:
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally197:
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11786 "ConfigurationInterfaces.c"
+#line 11819 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) {
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title);
-#line 11796 "ConfigurationInterfaces.c"
+#line 11829 "ConfigurationInterfaces.c"
 }
 
 
@@ -11812,7 +11845,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 11811 "ConfigurationInterfaces.c"
+#line 11844 "ConfigurationInterfaces.c"
 }
 
 
@@ -11858,7 +11891,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 11857 "ConfigurationInterfaces.c"
+#line 11890 "ConfigurationInterfaces.c"
 }
 
 
@@ -11871,41 +11904,41 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, &_inner_error_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11886 "ConfigurationInterfaces.c"
-				goto __catch197_configuration_error;
+#line 11919 "ConfigurationInterfaces.c"
+				goto __catch198_configuration_error;
 			}
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 11895 "ConfigurationInterfaces.c"
+#line 11928 "ConfigurationInterfaces.c"
 		}
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11901 "ConfigurationInterfaces.c"
+#line 11934 "ConfigurationInterfaces.c"
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11914,51 +11947,51 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		gchar* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_time_local ((time_t) 0, &_tmp6_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_time_format (&_tmp6_, "%p");
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = is_string_empty (_tmp8_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp8_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp10_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11939 "ConfigurationInterfaces.c"
+#line 11972 "ConfigurationInterfaces.c"
 	}
-	__finally197:
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally198:
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 11948 "ConfigurationInterfaces.c"
+#line 11981 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) {
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self);
-#line 11957 "ConfigurationInterfaces.c"
+#line 11990 "ConfigurationInterfaces.c"
 }
 
 
@@ -11968,69 +12001,69 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = use_24_hour_time;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, _tmp2_, &_inner_error_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11981 "ConfigurationInterfaces.c"
-				goto __catch198_configuration_error;
+#line 12014 "ConfigurationInterfaces.c"
+				goto __catch199_configuration_error;
 			}
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11990 "ConfigurationInterfaces.c"
+#line 12023 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12008 "ConfigurationInterfaces.c"
+#line 12041 "ConfigurationInterfaces.c"
 	}
-	__finally198:
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally199:
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12019 "ConfigurationInterfaces.c"
+#line 12052 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) {
-#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time);
-#line 12029 "ConfigurationInterfaces.c"
+#line 12062 "ConfigurationInterfaces.c"
 }
 
 
@@ -12043,77 +12076,77 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, &_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12058 "ConfigurationInterfaces.c"
-				goto __catch199_configuration_error;
+#line 12091 "ConfigurationInterfaces.c"
+				goto __catch200_configuration_error;
 			}
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 12067 "ConfigurationInterfaces.c"
+#line 12100 "ConfigurationInterfaces.c"
 		}
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12073 "ConfigurationInterfaces.c"
+#line 12106 "ConfigurationInterfaces.c"
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12094 "ConfigurationInterfaces.c"
+#line 12127 "ConfigurationInterfaces.c"
 	}
-	__finally199:
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally200:
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 12103 "ConfigurationInterfaces.c"
+#line 12136 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) {
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self);
-#line 12112 "ConfigurationInterfaces.c"
+#line 12145 "ConfigurationInterfaces.c"
 }
 
 
@@ -12123,69 +12156,69 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = b;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, _tmp2_, &_inner_error_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12136 "ConfigurationInterfaces.c"
-				goto __catch200_configuration_error;
+#line 12169 "ConfigurationInterfaces.c"
+				goto __catch201_configuration_error;
 			}
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12145 "ConfigurationInterfaces.c"
+#line 12178 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally201;
+	__catch201_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12163 "ConfigurationInterfaces.c"
+#line 12196 "ConfigurationInterfaces.c"
 	}
-	__finally200:
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally201:
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12174 "ConfigurationInterfaces.c"
+#line 12207 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) {
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b);
-#line 12184 "ConfigurationInterfaces.c"
+#line 12217 "ConfigurationInterfaces.c"
 }
 
 
@@ -12198,77 +12231,77 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, &_inner_error_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12213 "ConfigurationInterfaces.c"
-				goto __catch201_configuration_error;
+#line 12246 "ConfigurationInterfaces.c"
+				goto __catch202_configuration_error;
 			}
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 12222 "ConfigurationInterfaces.c"
+#line 12255 "ConfigurationInterfaces.c"
 		}
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12228 "ConfigurationInterfaces.c"
+#line 12261 "ConfigurationInterfaces.c"
 	}
-	goto __finally201;
-	__catch201_configuration_error:
+	goto __finally202;
+	__catch202_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = -1;
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12249 "ConfigurationInterfaces.c"
+#line 12282 "ConfigurationInterfaces.c"
 	}
-	__finally201:
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally202:
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 12258 "ConfigurationInterfaces.c"
+#line 12291 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) {
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self);
-#line 12267 "ConfigurationInterfaces.c"
+#line 12300 "ConfigurationInterfaces.c"
 }
 
 
@@ -12278,69 +12311,69 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state_cookie;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, _tmp2_, &_inner_error_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12291 "ConfigurationInterfaces.c"
-				goto __catch202_configuration_error;
+#line 12324 "ConfigurationInterfaces.c"
+				goto __catch203_configuration_error;
 			}
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12300 "ConfigurationInterfaces.c"
+#line 12333 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally202;
-	__catch202_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12318 "ConfigurationInterfaces.c"
+#line 12351 "ConfigurationInterfaces.c"
 	}
-	__finally202:
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally203:
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12329 "ConfigurationInterfaces.c"
+#line 12362 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) {
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie);
-#line 12339 "ConfigurationInterfaces.c"
+#line 12372 "ConfigurationInterfaces.c"
 }
 
 
@@ -12354,44 +12387,44 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade*
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12381 "ConfigurationInterfaces.c"
+#line 12414 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def);
-#line 12390 "ConfigurationInterfaces.c"
+#line 12423 "ConfigurationInterfaces.c"
 }
 
 
@@ -12402,38 +12435,38 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12423 "ConfigurationInterfaces.c"
+#line 12456 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val);
-#line 12432 "ConfigurationInterfaces.c"
+#line 12465 "ConfigurationInterfaces.c"
 }
 
 
@@ -12447,44 +12480,44 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade*
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12474 "ConfigurationInterfaces.c"
+#line 12507 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def);
-#line 12483 "ConfigurationInterfaces.c"
+#line 12516 "ConfigurationInterfaces.c"
 }
 
 
@@ -12495,38 +12528,38 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gdouble _tmp5_ = 0.0;
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12516 "ConfigurationInterfaces.c"
+#line 12549 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val);
-#line 12525 "ConfigurationInterfaces.c"
+#line 12558 "ConfigurationInterfaces.c"
 }
 
 
@@ -12540,44 +12573,44 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self,
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12567 "ConfigurationInterfaces.c"
+#line 12600 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def);
-#line 12576 "ConfigurationInterfaces.c"
+#line 12609 "ConfigurationInterfaces.c"
 }
 
 
@@ -12588,38 +12621,38 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self,
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12609 "ConfigurationInterfaces.c"
+#line 12642 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val);
-#line 12618 "ConfigurationInterfaces.c"
+#line 12651 "ConfigurationInterfaces.c"
 }
 
 
@@ -12637,65 +12670,65 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_string (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_result_ = _tmp7_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp9_ = _result_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_strcmp0 (_tmp9_, "") == 0) {
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = NULL;
-#line 12668 "ConfigurationInterfaces.c"
+#line 12701 "ConfigurationInterfaces.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _result_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp10_;
-#line 12675 "ConfigurationInterfaces.c"
+#line 12708 "ConfigurationInterfaces.c"
 	}
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp11_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_result_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12685 "ConfigurationInterfaces.c"
+#line 12718 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def);
-#line 12694 "ConfigurationInterfaces.c"
+#line 12727 "ConfigurationInterfaces.c"
 }
 
 
@@ -12707,46 +12740,46 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = val;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (_tmp0_ == NULL) {
-#line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = "";
-#line 12718 "ConfigurationInterfaces.c"
+#line 12751 "ConfigurationInterfaces.c"
 	}
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configuration_facade_get_engine (self);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = domain;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = id;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = key;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = val;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp2_);
-#line 12736 "ConfigurationInterfaces.c"
+#line 12769 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val);
-#line 12745 "ConfigurationInterfaces.c"
+#line 12778 "ConfigurationInterfaces.c"
 }
 
 
@@ -12756,36 +12789,36 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12775 "ConfigurationInterfaces.c"
+#line 12808 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key);
-#line 12784 "ConfigurationInterfaces.c"
+#line 12817 "ConfigurationInterfaces.c"
 }
 
 
@@ -12796,34 +12829,34 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura
 	const gchar* _tmp2_ = NULL;
 	FuzzyPropertyState _tmp3_ = 0;
 	FuzzyPropertyState _tmp4_ = 0;
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = configuration_engine_is_plugin_enabled (_tmp1_, _tmp2_);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = _tmp3_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp4_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12813 "ConfigurationInterfaces.c"
+#line 12846 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) {
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id);
-#line 12822 "ConfigurationInterfaces.c"
+#line 12855 "ConfigurationInterfaces.c"
 }
 
 
@@ -12832,30 +12865,30 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s
 	ConfigurationEngine* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = enabled;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12845 "ConfigurationInterfaces.c"
+#line 12878 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) {
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled);
-#line 12854 "ConfigurationInterfaces.c"
+#line 12887 "ConfigurationInterfaces.c"
 }
 
 
@@ -13144,14 +13177,14 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
 	g_signal_new ("external_app_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("import_directory_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13143 "ConfigurationInterfaces.c"
+#line 13176 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_instance_init (ConfigurationFacade * self) {
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self);
-#line 13150 "ConfigurationInterfaces.c"
+#line 13183 "ConfigurationInterfaces.c"
 }
 
 
@@ -13163,7 +13196,7 @@ static void configuration_facade_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->engine);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj);
-#line 13162 "ConfigurationInterfaces.c"
+#line 13195 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 29a3604..a9636ef 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -1515,7 +1515,16 @@ public abstract class ConfigurationFacade : Object {
     //
     public virtual int get_printing_size_selection() {
         try {
-            return get_engine().get_int_property(ConfigurableProperty.PRINTING_SIZE_SELECTION) - 1;
+            var val = get_engine().get_int_property(ConfigurableProperty.PRINTING_SIZE_SELECTION) - 1;
+            if (val == -2) {
+                if (Resources.get_default_measurement_unit() == Resources.UnitSystem.IMPERIAL) {
+                    val = 2;
+                } else {
+                    val = 10;
+                }
+            }
+
+            return val;
         } catch (ConfigurationError err) {
             on_configuration_error(err);
 
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index 6d9dfe0..873e431 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -3376,7 +3376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3379 "GSettingsEngine.c"
-				goto __catch203_g_regex_error;
+				goto __catch204_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -3401,7 +3401,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3404 "GSettingsEngine.c"
-				goto __catch203_g_regex_error;
+				goto __catch204_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3427,8 +3427,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 3429 "GSettingsEngine.c"
 	}
-	goto __finally203;
-	__catch203_g_regex_error:
+	goto __finally204;
+	__catch204_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3441,7 +3441,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 3443 "GSettingsEngine.c"
 	}
-	__finally203:
+	__finally204:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4600,7 +4600,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4603 "GSettingsEngine.c"
-				goto __catch204_configuration_error;
+				goto __catch205_configuration_error;
 			}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4620,8 +4620,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4622 "GSettingsEngine.c"
 	}
-	goto __finally204;
-	__catch204_configuration_error:
+	goto __finally205;
+	__catch205_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4649,7 +4649,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4651 "GSettingsEngine.c"
 	}
-	__finally204:
+	__finally205:
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4708,7 +4708,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4711 "GSettingsEngine.c"
-				goto __catch205_configuration_error;
+				goto __catch206_configuration_error;
 			}
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4721,8 +4721,8 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 4722 "GSettingsEngine.c"
 		}
 	}
-	goto __finally205;
-	__catch205_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4741,7 +4741,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		_g_error_free0 (err);
 #line 4743 "GSettingsEngine.c"
 	}
-	__finally205:
+	__finally206:
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4811,7 +4811,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4814 "GSettingsEngine.c"
-				goto __catch206_configuration_error;
+				goto __catch207_configuration_error;
 			}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4831,8 +4831,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4833 "GSettingsEngine.c"
 	}
-	goto __finally206;
-	__catch206_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4860,7 +4860,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4862 "GSettingsEngine.c"
 	}
-	__finally206:
+	__finally207:
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4919,7 +4919,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4922 "GSettingsEngine.c"
-				goto __catch207_configuration_error;
+				goto __catch208_configuration_error;
 			}
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4932,8 +4932,8 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 4933 "GSettingsEngine.c"
 		}
 	}
-	goto __finally207;
-	__catch207_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4952,7 +4952,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		_g_error_free0 (err);
 #line 4954 "GSettingsEngine.c"
 	}
-	__finally207:
+	__finally208:
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5022,7 +5022,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5025 "GSettingsEngine.c"
-				goto __catch208_configuration_error;
+				goto __catch209_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5042,8 +5042,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5044 "GSettingsEngine.c"
 	}
-	goto __finally208;
-	__catch208_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5071,7 +5071,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5073 "GSettingsEngine.c"
 	}
-	__finally208:
+	__finally209:
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5130,7 +5130,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5133 "GSettingsEngine.c"
-				goto __catch209_configuration_error;
+				goto __catch210_configuration_error;
 			}
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5143,8 +5143,8 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 5144 "GSettingsEngine.c"
 		}
 	}
-	goto __finally209;
-	__catch209_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5163,7 +5163,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		_g_error_free0 (err);
 #line 5165 "GSettingsEngine.c"
 	}
-	__finally209:
+	__finally210:
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5234,7 +5234,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5237 "GSettingsEngine.c"
-				goto __catch210_configuration_error;
+				goto __catch211_configuration_error;
 			}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5260,8 +5260,8 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5262 "GSettingsEngine.c"
 	}
-	goto __finally210;
-	__catch210_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5292,7 +5292,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5294 "GSettingsEngine.c"
 	}
-	__finally210:
+	__finally211:
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5351,7 +5351,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5354 "GSettingsEngine.c"
-				goto __catch211_configuration_error;
+				goto __catch212_configuration_error;
 			}
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5364,8 +5364,8 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 5365 "GSettingsEngine.c"
 		}
 	}
-	goto __finally211;
-	__catch211_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5384,7 +5384,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		_g_error_free0 (err);
 #line 5386 "GSettingsEngine.c"
 	}
-	__finally211:
+	__finally212:
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5446,7 +5446,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5449 "GSettingsEngine.c"
-				goto __catch212_configuration_error;
+				goto __catch213_configuration_error;
 			}
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5459,8 +5459,8 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 5460 "GSettingsEngine.c"
 		}
 	}
-	goto __finally212;
-	__catch212_configuration_error:
+	goto __finally213;
+	__catch213_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5479,7 +5479,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		_g_error_free0 (err);
 #line 5481 "GSettingsEngine.c"
 	}
-	__finally212:
+	__finally213:
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5529,7 +5529,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5532 "GSettingsEngine.c"
-				goto __catch213_configuration_error;
+				goto __catch214_configuration_error;
 			}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5559,8 +5559,8 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5561 "GSettingsEngine.c"
 	}
-	goto __finally213;
-	__catch213_configuration_error:
+	goto __finally214;
+	__catch214_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5585,7 +5585,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5587 "GSettingsEngine.c"
 	}
-	__finally213:
+	__finally214:
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5626,7 +5626,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5629 "GSettingsEngine.c"
-				goto __catch214_configuration_error;
+				goto __catch215_configuration_error;
 			}
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5639,8 +5639,8 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 5640 "GSettingsEngine.c"
 		}
 	}
-	goto __finally214;
-	__catch214_configuration_error:
+	goto __finally215;
+	__catch215_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5659,7 +5659,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		_g_error_free0 (err);
 #line 5661 "GSettingsEngine.c"
 	}
-	__finally214:
+	__finally215:
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5712,11 +5712,11 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5715 "GSettingsEngine.c"
-			goto __catch215_g_error;
+			goto __catch216_g_error;
 		}
 	}
-	goto __finally215;
-	__catch215_g_error:
+	goto __finally216;
+	__catch216_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5735,7 +5735,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 		_g_error_free0 (err);
 #line 5737 "GSettingsEngine.c"
 	}
-	__finally215:
+	__finally216:
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 3009d24..4d1d881 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -2387,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2389 "DataSource.c"
-				goto __catch49_g_error;
+				goto __catch50_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			ret = _tmp1_;
@@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 2409 "DataSource.c"
 			}
 		}
-		goto __finally49;
-		__catch49_g_error:
+		goto __finally50;
+		__catch50_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp6_ = NULL;
@@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_g_error_free0 (err);
 #line 2440 "DataSource.c"
 		}
-		__finally49:
+		__finally50:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 3cca952..edda651 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -757,14 +757,14 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 760 "SourceCollection.c"
-			goto __catch48_g_error;
+			goto __catch49_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 765 "SourceCollection.c"
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* err = NULL;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -777,7 +777,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_g_error_free0 (err);
 #line 779 "SourceCollection.c"
 	}
-	__finally48:
+	__finally49:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 93664d4..8558571 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -364,11 +364,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "DataImportSource.c"
-				goto __catch216_g_error;
+				goto __catch217_g_error;
 			}
 		}
-		goto __finally216;
-		__catch216_g_error:
+		goto __finally217;
+		__catch217_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp26_ = NULL;
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 401 "DataImportSource.c"
 		}
-		__finally216:
+		__finally217:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 586 "DataImportSource.c"
-					goto __catch217_g_error;
+					goto __catch218_g_error;
 				}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp57_ = preview_raw;
@@ -603,8 +603,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				preview_raw = (g_free (preview_raw), NULL);
 #line 605 "DataImportSource.c"
 			}
-			goto __finally217;
-			__catch217_g_error:
+			goto __finally218;
+			__catch218_g_error:
 			{
 				GError* e = NULL;
 				gchar* _tmp60_ = NULL;
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_error_free0 (e);
 #line 633 "DataImportSource.c"
 			}
-			__finally217:
+			__finally218:
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,14 +670,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 673 "DataImportSource.c"
-				goto __catch218_g_error;
+				goto __catch219_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally218;
-		__catch218_g_error:
+		goto __finally219;
+		__catch219_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp67_ = NULL;
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 706 "DataImportSource.c"
 		}
-		__finally218:
+		__finally219:
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,14 +742,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 745 "DataImportSource.c"
-				goto __catch219_g_error;
+				goto __catch220_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally219;
-		__catch219_g_error:
+		goto __finally220;
+		__catch220_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp74_ = NULL;
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 778 "DataImportSource.c"
 		}
-		__finally219:
+		__finally220:
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 6e17fe2..369ddae 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "DirectPhoto.c"
-			goto __catch44_g_error;
+			goto __catch45_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
@@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_object_unref0 (_tmp0_);
 #line 1272 "DirectPhoto.c"
 	}
-	goto __finally44;
-	__catch44_g_error:
+	goto __finally45;
+	__catch45_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_error_free0 (e);
 #line 1294 "DirectPhoto.c"
 	}
-	__finally44:
+	__finally45:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1340 "DirectPhoto.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1349 "DirectPhoto.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		return result;
 #line 1377 "DirectPhoto.c"
 	}
-	__finally45:
+	__finally46:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
 #line 2566 "DirectPhoto.c"
-					goto __catch46_g_error;
+					goto __catch47_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
@@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
 #line 2585 "DirectPhoto.c"
-						goto __catch46_g_error;
+						goto __catch47_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
@@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 2615 "DirectPhoto.c"
 			}
-			goto __finally46;
-			__catch46_g_error:
+			goto __finally47;
+			__catch47_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_ = NULL;
@@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_g_error_free0 (err);
 #line 2640 "DirectPhoto.c"
 			}
-			__finally46:
+			__finally47:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index aeefa98..cc6e84e 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -502,6 +502,7 @@ struct _DirectPhotoPagePrivate {
 	DirectViewCollection* view_controller;
 	GFile* current_save_dir;
 	gboolean drop_if_dirty;
+	GtkMenu* context_menu;
 };
 
 typedef enum  {
@@ -740,6 +741,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self);
 GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
 GFile* media_source_get_file (MediaSource* self);
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event);
+gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event);
+static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self);
 static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self);
 GType zoom_state_get_type (void) G_GNUC_CONST;
 ZoomState* zoom_state_dup (const ZoomState* self);
@@ -795,6 +798,7 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
 gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport);
+gboolean data_source_equals (DataSource* self, DataSource* source);
 GType direct_view_get_type (void) G_GNUC_CONST;
 DirectView* direct_view_new (DirectPhoto* source);
 DirectView* direct_view_construct (GType object_type, DirectPhoto* source);
@@ -862,182 +866,182 @@ static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_phot
 static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_photos_altered ((DirectPhotoPage*) self, items);
-#line 866 "DirectPhotoPage.c"
+#line 870 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_save ((DirectPhotoPage*) self);
-#line 873 "DirectPhotoPage.c"
+#line 877 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_save_as ((DirectPhotoPage*) self);
-#line 880 "DirectPhotoPage.c"
+#line 884 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_send_to ((DirectPhotoPage*) self);
-#line 887 "DirectPhotoPage.c"
+#line 891 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_print ((DirectPhotoPage*) self);
-#line 894 "DirectPhotoPage.c"
+#line 898 "DirectPhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 901 "DirectPhotoPage.c"
+#line 905 "DirectPhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 908 "DirectPhotoPage.c"
+#line 912 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 915 "DirectPhotoPage.c"
+#line 919 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 922 "DirectPhotoPage.c"
+#line 926 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 929 "DirectPhotoPage.c"
+#line 933 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 936 "DirectPhotoPage.c"
+#line 940 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 943 "DirectPhotoPage.c"
+#line 947 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 950 "DirectPhotoPage.c"
+#line 954 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 957 "DirectPhotoPage.c"
+#line 961 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 964 "DirectPhotoPage.c"
+#line 968 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 971 "DirectPhotoPage.c"
+#line 975 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 978 "DirectPhotoPage.c"
+#line 982 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 985 "DirectPhotoPage.c"
+#line 989 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 992 "DirectPhotoPage.c"
+#line 996 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 999 "DirectPhotoPage.c"
+#line 1003 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 1006 "DirectPhotoPage.c"
+#line 1010 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 1013 "DirectPhotoPage.c"
+#line 1017 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 1020 "DirectPhotoPage.c"
+#line 1024 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 1027 "DirectPhotoPage.c"
+#line 1031 "DirectPhotoPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1034 "DirectPhotoPage.c"
+#line 1038 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_selection_group_altered ((DirectPhotoPage*) self);
-#line 1041 "DirectPhotoPage.c"
+#line 1045 "DirectPhotoPage.c"
 }
 
 
@@ -1077,7 +1081,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_tmp5_ = direct_photo_page_check_editable_file (_tmp4_);
 #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp5_) {
-#line 1081 "DirectPhotoPage.c"
+#line 1085 "DirectPhotoPage.c"
 		Application* _tmp6_ = NULL;
 		Application* _tmp7_ = NULL;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1090,7 +1094,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 		_application_unref0 (_tmp7_);
 #line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return self;
-#line 1094 "DirectPhotoPage.c"
+#line 1098 "DirectPhotoPage.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = file;
@@ -1128,14 +1132,14 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_data_collection_unref0 (_tmp15_);
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 1132 "DirectPhotoPage.c"
+#line 1136 "DirectPhotoPage.c"
 }
 
 
 DirectPhotoPage* direct_photo_page_new (GFile* file) {
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_photo_page_construct (TYPE_DIRECT_PHOTO_PAGE, file);
-#line 1139 "DirectPhotoPage.c"
+#line 1143 "DirectPhotoPage.c"
 }
 
 
@@ -1160,7 +1164,7 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp2_ = ui_filenames;
 #line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui");
-#line 1164 "DirectPhotoPage.c"
+#line 1168 "DirectPhotoPage.c"
 }
 
 
@@ -1180,7 +1184,7 @@ static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
-#line 1184 "DirectPhotoPage.c"
+#line 1188 "DirectPhotoPage.c"
 }
 
 
@@ -1195,7 +1199,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 1199 "DirectPhotoPage.c"
+#line 1203 "DirectPhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1207,11 +1211,11 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries);
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 1211 "DirectPhotoPage.c"
+#line 1215 "DirectPhotoPage.c"
 			GActionEntry entry = {0};
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 1215 "DirectPhotoPage.c"
+#line 1219 "DirectPhotoPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
@@ -1224,7 +1228,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1228 "DirectPhotoPage.c"
+#line 1232 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -1234,7 +1238,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 1238 "DirectPhotoPage.c"
+#line 1242 "DirectPhotoPage.c"
 }
 
 
@@ -1245,13 +1249,13 @@ static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1249 "DirectPhotoPage.c"
+#line 1253 "DirectPhotoPage.c"
 	}
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1255 "DirectPhotoPage.c"
+#line 1259 "DirectPhotoPage.c"
 }
 
 
@@ -1262,13 +1266,13 @@ static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1266 "DirectPhotoPage.c"
+#line 1270 "DirectPhotoPage.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1272 "DirectPhotoPage.c"
+#line 1276 "DirectPhotoPage.c"
 }
 
 
@@ -1344,7 +1348,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	if (result_length1) {
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*result_length1 = _tmp10__length1;
-#line 1348 "DirectPhotoPage.c"
+#line 1352 "DirectPhotoPage.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp10_;
@@ -1354,7 +1358,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	_injection_group_unref0 (print_group);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1358 "DirectPhotoPage.c"
+#line 1362 "DirectPhotoPage.c"
 }
 
 
@@ -1381,7 +1385,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	_g_free0 (_tmp2_);
 #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp4_) {
-#line 1385 "DirectPhotoPage.c"
+#line 1389 "DirectPhotoPage.c"
 		const gchar* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -1406,7 +1410,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 		_g_free0 (_tmp10_);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp8_);
-#line 1410 "DirectPhotoPage.c"
+#line 1414 "DirectPhotoPage.c"
 	} else {
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1427,7 +1431,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 		_g_free0 (_tmp13_);
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp15_) {
-#line 1431 "DirectPhotoPage.c"
+#line 1435 "DirectPhotoPage.c"
 			const gchar* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -1452,7 +1456,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 			_g_free0 (_tmp21_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp19_);
-#line 1456 "DirectPhotoPage.c"
+#line 1460 "DirectPhotoPage.c"
 		} else {
 			GFile* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
@@ -1462,7 +1466,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 			_tmp23_ = photo_file_format_is_file_supported (_tmp22_);
 #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (!_tmp23_) {
-#line 1466 "DirectPhotoPage.c"
+#line 1470 "DirectPhotoPage.c"
 				const gchar* _tmp24_ = NULL;
 				GFile* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
@@ -1487,13 +1491,13 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 				_g_free0 (_tmp29_);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp27_);
-#line 1491 "DirectPhotoPage.c"
+#line 1495 "DirectPhotoPage.c"
 			} else {
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = TRUE;
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 1497 "DirectPhotoPage.c"
+#line 1501 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -1501,7 +1505,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	result = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1505 "DirectPhotoPage.c"
+#line 1509 "DirectPhotoPage.c"
 }
 
 
@@ -1518,7 +1522,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget));
-#line 1522 "DirectPhotoPage.c"
+#line 1526 "DirectPhotoPage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = direct_photo_global;
@@ -1532,7 +1536,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	_tmp3_ = photo;
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1536 "DirectPhotoPage.c"
+#line 1540 "DirectPhotoPage.c"
 		DirectViewCollection* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1541,7 +1545,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		_tmp5_ = photo;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo));
-#line 1545 "DirectPhotoPage.c"
+#line 1549 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1567,7 +1571,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		_g_free0 (_tmp11_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp9_);
-#line 1571 "DirectPhotoPage.c"
+#line 1575 "DirectPhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->initial_file);
@@ -1575,14 +1579,14 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	self->priv->initial_file = NULL;
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1579 "DirectPhotoPage.c"
+#line 1583 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 1586 "DirectPhotoPage.c"
+#line 1590 "DirectPhotoPage.c"
 }
 
 
@@ -1610,7 +1614,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_g_object_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_) {
-#line 1614 "DirectPhotoPage.c"
+#line 1618 "DirectPhotoPage.c"
 		DirectPhoto* tmp = NULL;
 		Photo* _tmp3_ = NULL;
 		DirectPhoto* _tmp4_ = NULL;
@@ -1623,7 +1627,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		if (_tmp4_ == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 1627 "DirectPhotoPage.c"
+#line 1631 "DirectPhotoPage.c"
 		}
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		tmp = _tmp4_;
@@ -1631,7 +1635,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		_tmp5_ = tmp;
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 1635 "DirectPhotoPage.c"
+#line 1639 "DirectPhotoPage.c"
 			DirectPhoto* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1640,11 +1644,11 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 			g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self);
-#line 1644 "DirectPhotoPage.c"
+#line 1648 "DirectPhotoPage.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp);
-#line 1648 "DirectPhotoPage.c"
+#line 1652 "DirectPhotoPage.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = new_photo;
@@ -1660,17 +1664,17 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_tmp11_ = tmp;
 #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_ != NULL) {
-#line 1664 "DirectPhotoPage.c"
+#line 1668 "DirectPhotoPage.c"
 		DirectPhoto* _tmp12_ = NULL;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = tmp;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
-#line 1670 "DirectPhotoPage.c"
+#line 1674 "DirectPhotoPage.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp);
-#line 1674 "DirectPhotoPage.c"
+#line 1678 "DirectPhotoPage.c"
 }
 
 
@@ -1696,22 +1700,92 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	result = _tmp3_;
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1700 "DirectPhotoPage.c"
+#line 1704 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp1_ = NULL;
+	GdkEventButton* _tmp2_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = direct_photo_page_get_context_menu (self);
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp1_ = _tmp0_;
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp2_ = event;
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1715 "DirectPhotoPage.c"
+#line 1732 "DirectPhotoPage.c"
+}
+
+
+static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
+	GtkMenu* result = NULL;
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp7_ = NULL;
+	GtkMenu* _tmp8_ = NULL;
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = self->priv->context_menu;
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	if (_tmp0_ == NULL) {
+#line 1747 "DirectPhotoPage.c"
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		GObject* _tmp2_ = NULL;
+		GMenuModel* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GtkMenu* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp2_ = gtk_builder_get_object (_tmp1_, "DirectContextMenu");
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		model = _tmp3_;
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp4_ = model;
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		g_object_ref_sink (_tmp5_);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (self->priv->context_menu);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		self->priv->context_menu = _tmp5_;
+#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp6_ = self->priv->context_menu;
+#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (model);
+#line 1779 "DirectPhotoPage.c"
+	}
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp7_ = self->priv->context_menu;
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	result = _tmp8_;
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	return result;
+#line 1789 "DirectPhotoPage.c"
 }
 
 
@@ -1722,73 +1796,73 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 1734 "DirectPhotoPage.c"
+#line 1808 "DirectPhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 1740 "DirectPhotoPage.c"
+#line 1814 "DirectPhotoPage.c"
 	} else {
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 1744 "DirectPhotoPage.c"
+#line 1818 "DirectPhotoPage.c"
 	}
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 1754 "DirectPhotoPage.c"
+#line 1828 "DirectPhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 1760 "DirectPhotoPage.c"
+#line 1834 "DirectPhotoPage.c"
 	} else {
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 1764 "DirectPhotoPage.c"
+#line 1838 "DirectPhotoPage.c"
 	}
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 1768 "DirectPhotoPage.c"
+#line 1842 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 163 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1780 "DirectPhotoPage.c"
+#line 1854 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1792 "DirectPhotoPage.c"
+#line 1866 "DirectPhotoPage.c"
 }
 
 
@@ -1802,24 +1876,24 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	contains = FALSE;
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 1816 "DirectPhotoPage.c"
+#line 1890 "DirectPhotoPage.c"
 		Photo* photo = NULL;
 		Photo* _tmp1_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo = _tmp1_;
-#line 1823 "DirectPhotoPage.c"
+#line 1897 "DirectPhotoPage.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeMap* _tmp2_ = NULL;
@@ -1828,25 +1902,25 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 			GeeSet* _tmp5_ = NULL;
 			GeeIterator* _tmp6_ = NULL;
 			GeeIterator* _tmp7_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp2_ = map;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp3_ = gee_map_get_keys (_tmp2_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp4_ = _tmp3_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp5_ = _tmp4_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp5_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_object_it = _tmp7_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			while (TRUE) {
-#line 1850 "DirectPhotoPage.c"
+#line 1924 "DirectPhotoPage.c"
 				GeeIterator* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
 				DataObject* object = NULL;
@@ -1854,129 +1928,129 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 				gpointer _tmp11_ = NULL;
 				DataObject* _tmp12_ = NULL;
 				Photo* _tmp13_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp8_ = _object_it;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp9_ = gee_iterator_next (_tmp8_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (!_tmp9_) {
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1866 "DirectPhotoPage.c"
+#line 1940 "DirectPhotoPage.c"
 				}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp10_ = _object_it;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp11_ = gee_iterator_get (_tmp10_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				object = (DataObject*) _tmp11_;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp12_ = object;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp13_ = photo;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) {
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					contains = TRUE;
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					_g_object_unref0 (object);
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1886 "DirectPhotoPage.c"
+#line 1960 "DirectPhotoPage.c"
 				}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (object);
-#line 1890 "DirectPhotoPage.c"
+#line 1964 "DirectPhotoPage.c"
 			}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_object_it);
-#line 1894 "DirectPhotoPage.c"
+#line 1968 "DirectPhotoPage.c"
 		}
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1898 "DirectPhotoPage.c"
+#line 1972 "DirectPhotoPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp15_) {
-#line 1904 "DirectPhotoPage.c"
+#line 1978 "DirectPhotoPage.c"
 		gboolean _tmp16_ = FALSE;
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = !_tmp16_;
-#line 1910 "DirectPhotoPage.c"
+#line 1984 "DirectPhotoPage.c"
 	} else {
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 1914 "DirectPhotoPage.c"
+#line 1988 "DirectPhotoPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitive = _tmp14_;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitive;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp17_) {
-#line 1922 "DirectPhotoPage.c"
+#line 1996 "DirectPhotoPage.c"
 		gboolean _tmp18_ = FALSE;
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = contains;
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		sensitive = _tmp18_;
-#line 1928 "DirectPhotoPage.c"
+#line 2002 "DirectPhotoPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitive;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp20_) {
-#line 1934 "DirectPhotoPage.c"
+#line 2008 "DirectPhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		PhotoFileFormat _tmp23_ = 0;
 		gboolean _tmp24_ = FALSE;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp23_ = photo_get_file_format (_tmp22_);
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp24_ = photo_file_format_can_write (_tmp23_);
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = _tmp24_;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1951 "DirectPhotoPage.c"
+#line 2025 "DirectPhotoPage.c"
 	} else {
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = FALSE;
-#line 1955 "DirectPhotoPage.c"
+#line 2029 "DirectPhotoPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitive;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 1963 "DirectPhotoPage.c"
+#line 2037 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	command_manager_reset (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 1980 "DirectPhotoPage.c"
+#line 2054 "DirectPhotoPage.c"
 }
 
 
@@ -1989,51 +2063,51 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	FullscreenWindow* _tmp2_ = NULL;
 	GdkEventButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2005 "DirectPhotoPage.c"
+#line 2079 "DirectPhotoPage.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	fs = _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = fs;
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 2013 "DirectPhotoPage.c"
+#line 2087 "DirectPhotoPage.c"
 		FullscreenWindow* _tmp3_ = NULL;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = fs;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (fs);
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2025 "DirectPhotoPage.c"
+#line 2099 "DirectPhotoPage.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = event;
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp4_);
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp5_;
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2037 "DirectPhotoPage.c"
+#line 2111 "DirectPhotoPage.c"
 }
 
 
@@ -2069,135 +2143,135 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	gboolean _tmp26_ = FALSE;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp29_ = FALSE;
-#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = missing;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = sensitivity;
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_);
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = sensitivity;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_);
-#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = sensitivity;
-#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_);
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = sensitivity;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_);
-#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = sensitivity;
-#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = sensitivity;
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_);
-#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = sensitivity;
-#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_);
-#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = sensitivity;
-#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = sensitivity;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = sensitivity;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = sensitivity;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_);
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = sensitivity;
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = sensitivity;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_);
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = sensitivity;
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_);
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = sensitivity;
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_);
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = sensitivity;
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_);
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitivity;
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_);
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = sensitivity;
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_);
-#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = sensitivity;
-#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_);
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitivity;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_);
-#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = sensitivity;
-#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_);
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = sensitivity;
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_);
-#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = sensitivity;
-#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_);
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = sensitivity;
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_);
-#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitivity;
-#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_);
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp27_) {
-#line 2183 "DirectPhotoPage.c"
+#line 2257 "DirectPhotoPage.c"
 		gboolean _tmp28_ = FALSE;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = !_tmp28_;
-#line 2189 "DirectPhotoPage.c"
+#line 2263 "DirectPhotoPage.c"
 	} else {
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 2193 "DirectPhotoPage.c"
+#line 2267 "DirectPhotoPage.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = missing;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_);
-#line 2201 "DirectPhotoPage.c"
+#line 2275 "DirectPhotoPage.c"
 }
 
 
@@ -2232,157 +2306,157 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	gboolean _tmp42_ = FALSE;
 	gint _tmp46_ = 0;
 	gint _tmp47_ = 0;
-#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	multiple = _tmp3_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 2254 "DirectPhotoPage.c"
+#line 2328 "DirectPhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_has_transformations (_tmp8_);
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp10_) {
-#line 2272 "DirectPhotoPage.c"
+#line 2346 "DirectPhotoPage.c"
 			gboolean _tmp11_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = !_tmp11_;
-#line 2278 "DirectPhotoPage.c"
+#line 2352 "DirectPhotoPage.c"
 		} else {
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 2282 "DirectPhotoPage.c"
+#line 2356 "DirectPhotoPage.c"
 		}
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp6_;
-#line 2286 "DirectPhotoPage.c"
+#line 2360 "DirectPhotoPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 2290 "DirectPhotoPage.c"
+#line 2364 "DirectPhotoPage.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	revert_possible = _tmp4_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp13_) {
-#line 2298 "DirectPhotoPage.c"
+#line 2372 "DirectPhotoPage.c"
 		Photo* _tmp14_ = NULL;
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp15_);
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _tmp16_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 2312 "DirectPhotoPage.c"
+#line 2386 "DirectPhotoPage.c"
 	} else {
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 2316 "DirectPhotoPage.c"
+#line 2390 "DirectPhotoPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	rotate_possible = _tmp12_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp18_) {
-#line 2324 "DirectPhotoPage.c"
+#line 2398 "DirectPhotoPage.c"
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp20_);
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = _tmp21_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 2338 "DirectPhotoPage.c"
+#line 2412 "DirectPhotoPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = FALSE;
-#line 2342 "DirectPhotoPage.c"
+#line 2416 "DirectPhotoPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	enhance_possible = _tmp17_;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = multiple;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_);
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = multiple;
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_);
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = rotate_possible;
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_);
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = rotate_possible;
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_);
-#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = rotate_possible;
-#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_);
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = rotate_possible;
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_);
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = revert_possible;
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_);
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = enhance_possible;
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_);
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp30_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_);
-#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp31_) {
-#line 2386 "DirectPhotoPage.c"
+#line 2460 "DirectPhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
 		Scaling _tmp34_ = {0};
@@ -2391,69 +2465,69 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		Photo* _tmp37_ = NULL;
 		Scaling _tmp38_ = {0};
 		gboolean _tmp39_ = FALSE;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 2419 "DirectPhotoPage.c"
+#line 2493 "DirectPhotoPage.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = _tmp40_;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = _tmp41_ != NULL;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp41_);
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp42_) {
-#line 2431 "DirectPhotoPage.c"
+#line 2505 "DirectPhotoPage.c"
 		Photo* _tmp43_ = NULL;
 		Photo* _tmp44_ = NULL;
 		PhotoFileFormat _tmp45_ = 0;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp44_ = _tmp43_;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp45_ = photo_get_file_format (_tmp44_);
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW);
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp44_);
-#line 2445 "DirectPhotoPage.c"
+#line 2519 "DirectPhotoPage.c"
 	} else {
-#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 2449 "DirectPhotoPage.c"
+#line 2523 "DirectPhotoPage.c"
 	}
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = selected_count;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = count;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_);
-#line 2457 "DirectPhotoPage.c"
+#line 2531 "DirectPhotoPage.c"
 }
 
 
@@ -2485,216 +2559,216 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	GtkResponseType _tmp23_ = 0;
 	GtkResponseType _tmp24_ = 0;
 	GtkResponseType _tmp25_ = 0;
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE);
-#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = photo;
-#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2501 "DirectPhotoPage.c"
+#line 2575 "DirectPhotoPage.c"
 	}
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = photo;
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = photo_has_alterations (_tmp1_);
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2513 "DirectPhotoPage.c"
+#line 2587 "DirectPhotoPage.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = self->priv->drop_if_dirty;
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 2519 "DirectPhotoPage.c"
+#line 2593 "DirectPhotoPage.c"
 		Photo* _tmp4_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = photo;
-#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp4_);
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2529 "DirectPhotoPage.c"
+#line 2603 "DirectPhotoPage.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = photo_get_file_format (_tmp6_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = photo_file_format_can_write (_tmp7_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	is_writeable = _tmp9_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = is_writeable;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_) {
-#line 2549 "DirectPhotoPage.c"
+#line 2623 "DirectPhotoPage.c"
 		const gchar* _tmp12_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _ ("_Save");
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp12_;
-#line 2555 "DirectPhotoPage.c"
+#line 2629 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _ ("_Save a Copy");
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp13_;
-#line 2562 "DirectPhotoPage.c"
+#line 2636 "DirectPhotoPage.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_option = _tmp14_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = _ ("Lose changes to %s?");
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = photo;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = g_strdup_printf (_tmp15_, _tmp18_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = save_option;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _ ("Close _without Saving");
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = _tmp23_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp20_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp18_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp24_;
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = response;
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp25_ == GTK_RESPONSE_YES) {
-#line 2598 "DirectPhotoPage.c"
+#line 2672 "DirectPhotoPage.c"
 		Photo* _tmp26_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = photo;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp26_);
-#line 2604 "DirectPhotoPage.c"
+#line 2678 "DirectPhotoPage.c"
 	} else {
 		GtkResponseType _tmp27_ = 0;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp27_ = response;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp27_ == GTK_RESPONSE_NO) {
-#line 2611 "DirectPhotoPage.c"
+#line 2685 "DirectPhotoPage.c"
 			gboolean _tmp28_ = FALSE;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp28_ = is_writeable;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp28_) {
-#line 2617 "DirectPhotoPage.c"
+#line 2691 "DirectPhotoPage.c"
 				Photo* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				Photo* _tmp33_ = NULL;
 				PhotoFileFormat _tmp34_ = 0;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = photo;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = _tmp32_;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = photo_get_file_format (_tmp33_);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp31_);
-#line 2642 "DirectPhotoPage.c"
+#line 2716 "DirectPhotoPage.c"
 			} else {
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_on_save_as (self);
-#line 2646 "DirectPhotoPage.c"
+#line 2720 "DirectPhotoPage.c"
 			}
 		} else {
 			gboolean _tmp35_ = FALSE;
 			gboolean _tmp36_ = FALSE;
 			GtkResponseType _tmp37_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp37_ = response;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp37_ == GTK_RESPONSE_CANCEL) {
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = TRUE;
-#line 2658 "DirectPhotoPage.c"
+#line 2732 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp38_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp38_ = response;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT;
-#line 2665 "DirectPhotoPage.c"
+#line 2739 "DirectPhotoPage.c"
 			}
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp36_) {
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = TRUE;
-#line 2671 "DirectPhotoPage.c"
+#line 2745 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp39_ = 0;
-#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp39_ = response;
-#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE;
-#line 2678 "DirectPhotoPage.c"
+#line 2752 "DirectPhotoPage.c"
 			}
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp35_) {
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = FALSE;
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (save_option);
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 2688 "DirectPhotoPage.c"
+#line 2762 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (save_option);
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2698 "DirectPhotoPage.c"
+#line 2772 "DirectPhotoPage.c"
 }
 
 
@@ -2704,23 +2778,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2724 "DirectPhotoPage.c"
+#line 2798 "DirectPhotoPage.c"
 }
 
 
@@ -2729,36 +2803,36 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 2743 "DirectPhotoPage.c"
+#line 2817 "DirectPhotoPage.c"
 		Photo* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = old_photo;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp3_;
-#line 2752 "DirectPhotoPage.c"
+#line 2826 "DirectPhotoPage.c"
 	} else {
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2756 "DirectPhotoPage.c"
+#line 2830 "DirectPhotoPage.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2762 "DirectPhotoPage.c"
+#line 2836 "DirectPhotoPage.c"
 }
 
 
@@ -2773,29 +2847,29 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	DirectPhoto* _tmp21_ = NULL;
 	gchar* _tmp22_ = NULL;
 	gchar* _tmp23_ = NULL;
-	DirectView* tmp_view = NULL;
-	DirectPhoto* _tmp24_ = NULL;
-	DirectView* _tmp25_ = NULL;
-	DirectViewCollection* _tmp26_ = NULL;
-	DirectView* _tmp27_ = NULL;
-	DirectPhotoSourceCollection* _tmp28_ = NULL;
-	DirectPhoto* _tmp29_ = NULL;
-	DirectViewCollection* _tmp30_ = NULL;
-	DirectPhoto* _tmp31_ = NULL;
+	Photo* _tmp24_ = NULL;
+	Photo* _tmp25_ = NULL;
+	DirectPhoto* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	gboolean _tmp28_ = FALSE;
+	DirectPhotoSourceCollection* _tmp33_ = NULL;
+	DirectPhoto* _tmp34_ = NULL;
+	DirectViewCollection* _tmp35_ = NULL;
+	DirectPhoto* _tmp36_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (G_IS_FILE (dest));
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = constraint;
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = scale;
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling = _tmp2_;
-#line 2799 "DirectPhotoPage.c"
+#line 2873 "DirectPhotoPage.c"
 	{
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -2805,34 +2879,34 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = dest;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = scaling;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = quality;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = format;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = copy_unmodified;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = save_metadata;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2831 "DirectPhotoPage.c"
-			goto __catch47_g_error;
+#line 2905 "DirectPhotoPage.c"
+			goto __catch48_g_error;
 		}
 	}
-	goto __finally47;
-	__catch47_g_error:
+	goto __finally48;
+	__catch48_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -2843,92 +2917,114 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		err = _inner_error_;
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_inner_error_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _ ("Error while saving to %s: %s");
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = dest;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = g_file_get_path (_tmp12_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = err;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp18_, NULL);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp18_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp14_);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_error_free0 (err);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2877 "DirectPhotoPage.c"
+#line 2951 "DirectPhotoPage.c"
 	}
-	__finally47:
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	__finally48:
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_critical ("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 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2888 "DirectPhotoPage.c"
+#line 2962 "DirectPhotoPage.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = direct_photo_global;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = dest;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE);
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp21_;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp23_);
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = photo;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25_ = direct_view_new (_tmp24_);
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	tmp_view = _tmp25_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp26_ = self->priv->view_controller;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_ = tmp_view;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject));
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp28_ = direct_photo_global;
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp29_ = photo;
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_source_collection_reimport_photo (_tmp28_, _tmp29_);
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp30_ = self->priv->view_controller;
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_ = photo;
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo));
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (tmp_view);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp25_ = _tmp24_;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp26_ = photo;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp27_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp28_ = !_tmp27_;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (_tmp25_);
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	if (_tmp28_) {
+#line 2992 "DirectPhotoPage.c"
+		DirectView* tmp_view = NULL;
+		DirectPhoto* _tmp29_ = NULL;
+		DirectView* _tmp30_ = NULL;
+		DirectViewCollection* _tmp31_ = NULL;
+		DirectView* _tmp32_ = NULL;
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp29_ = photo;
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp30_ = direct_view_new (_tmp29_);
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		tmp_view = _tmp30_;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp31_ = self->priv->view_controller;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp32_ = tmp_view;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (tmp_view);
+#line 3012 "DirectPhotoPage.c"
+	}
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp33_ = direct_photo_global;
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp34_ = photo;
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_source_collection_reimport_photo (_tmp33_, _tmp34_);
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp35_ = self->priv->view_controller;
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp36_ = photo;
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo));
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 2932 "DirectPhotoPage.c"
+#line 3028 "DirectPhotoPage.c"
 }
 
 
@@ -2946,84 +3042,84 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	Photo* _tmp15_ = NULL;
 	Photo* _tmp16_ = NULL;
 	PhotoFileFormat _tmp17_ = 0;
-#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = photo_has_alterations (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = !_tmp4_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 2966 "DirectPhotoPage.c"
+#line 3062 "DirectPhotoPage.c"
 	} else {
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = photo_get_file_format (_tmp7_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_file_format_can_write (_tmp8_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = !_tmp9_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2984 "DirectPhotoPage.c"
+#line 3080 "DirectPhotoPage.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_) {
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2990 "DirectPhotoPage.c"
+#line 3086 "DirectPhotoPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp10_;
-#line 2997 "DirectPhotoPage.c"
+#line 3093 "DirectPhotoPage.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3003 "DirectPhotoPage.c"
+#line 3099 "DirectPhotoPage.c"
 	}
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = photo_get_file_format (_tmp16_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 3027 "DirectPhotoPage.c"
+#line 3123 "DirectPhotoPage.c"
 }
 
 
@@ -3088,114 +3184,114 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	gint _tmp54_ = 0;
 	gint _tmp55_ = 0;
 	GtkFileChooserDialog* _tmp74_ = NULL;
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _ ("Save As");
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = export_dialog_new (_tmp0_);
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_dialog = _tmp1_;
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_format_parameters_last (&_tmp2_);
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_params = _tmp2_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = export_dialog;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scale = _tmp4_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	constraint = _tmp5_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3120 "DirectPhotoPage.c"
+#line 3216 "DirectPhotoPage.c"
 	}
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = export_params;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = _tmp10_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	filename = _tmp11_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = export_params;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_);
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	effective_export_format = _tmp16_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = effective_export_format;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = photo_file_format_get_properties (_tmp17_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22__length1 = _tmp20_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_photo_file_format_properties_unref0 (_tmp19_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = _tmp22_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions_length1 = _tmp22__length1;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_output_format_extensions_size_ = output_format_extensions_length1;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = gtk_file_filter_new ();
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp23_);
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_filter = _tmp23_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = output_format_extensions;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24__length1 = output_format_extensions_length1;
-#line 3180 "DirectPhotoPage.c"
+#line 3276 "DirectPhotoPage.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection = _tmp24_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection_length1 = _tmp24__length1;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) {
-#line 3192 "DirectPhotoPage.c"
+#line 3288 "DirectPhotoPage.c"
 			gchar* _tmp25_ = NULL;
 			gchar* extension = NULL;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp25_ = g_strdup (extension_collection[extension_it]);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			extension = _tmp25_;
-#line 3199 "DirectPhotoPage.c"
+#line 3295 "DirectPhotoPage.c"
 			{
 				gchar* uppercase_extension = NULL;
 				const gchar* _tmp26_ = NULL;
@@ -3208,109 +3304,109 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 				const gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = extension;
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1);
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				uppercase_extension = _tmp27_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = output_format_filter;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = extension;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = g_strconcat ("*.", _tmp29_, NULL);
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp28_, _tmp31_);
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp31_);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = output_format_filter;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = uppercase_extension;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = g_strconcat ("*.", _tmp33_, NULL);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp34_;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp32_, _tmp35_);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp35_);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (uppercase_extension);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (extension);
-#line 3246 "DirectPhotoPage.c"
+#line 3342 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp36_ = _ ("Save As");
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp37_ = app_window_get_instance ();
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp38_ = _tmp37_;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = _tmp39_;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp38_);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as_dialog = _tmp40_;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = save_as_dialog;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = save_as_dialog;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp43_ = filename;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp44_ = save_as_dialog;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp45_ = self->priv->current_save_dir;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = g_file_get_path (_tmp45_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = _tmp46_;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp47_);
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp48_ = save_as_dialog;
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp49_ = output_format_filter;
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp50_ = _g_object_ref0 (_tmp49_);
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_);
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp51_ = save_as_dialog;
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp52_ = save_as_dialog;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp53_ = save_as_dialog;
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog));
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp54_;
-#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp55_ = response;
-#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) {
-#line 3314 "DirectPhotoPage.c"
+#line 3410 "DirectPhotoPage.c"
 		GtkFileChooserDialog* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -3329,106 +3425,106 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 		gchar* _tmp71_ = NULL;
 		gchar* _tmp72_ = NULL;
 		GFile* _tmp73_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = TRUE;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp56_ = save_as_dialog;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp59_ = g_file_new_for_uri (_tmp58_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp61_ = scale;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp62_ = constraint;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp63_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp64_ = _tmp63_.quality;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp65_ = effective_export_format;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp66_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp67_ = _tmp66_.mode;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp68_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp69_ = _tmp68_.export_metadata;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp58_);
-#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = FALSE;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp70_ = save_as_dialog;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp72_ = _tmp71_;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp73_ = g_file_new_for_path (_tmp72_);
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self->priv->current_save_dir);
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->current_save_dir = _tmp73_;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp72_);
-#line 3385 "DirectPhotoPage.c"
+#line 3481 "DirectPhotoPage.c"
 	}
-#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp74_ = save_as_dialog;
-#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (save_as_dialog);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (output_format_filter);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = (_vala_array_free (output_format_extensions, output_format_extensions_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (filename);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 3401 "DirectPhotoPage.c"
+#line 3497 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 416 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 3413 "DirectPhotoPage.c"
+#line 3509 "DirectPhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 3432 "DirectPhotoPage.c"
+#line 3528 "DirectPhotoPage.c"
 	}
 }
 
@@ -3442,93 +3538,93 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 3450 "DirectPhotoPage.c"
+#line 3546 "DirectPhotoPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	handled = TRUE;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = event;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3473 "DirectPhotoPage.c"
+#line 3569 "DirectPhotoPage.c"
 			default:
 			{
-#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3480 "DirectPhotoPage.c"
+#line 3576 "DirectPhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3486 "DirectPhotoPage.c"
+#line 3582 "DirectPhotoPage.c"
 			default:
 			{
-#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3493 "DirectPhotoPage.c"
+#line 3589 "DirectPhotoPage.c"
 			}
 		}
 	} else {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3499 "DirectPhotoPage.c"
+#line 3595 "DirectPhotoPage.c"
 			default:
 			{
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				handled = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3506 "DirectPhotoPage.c"
+#line 3602 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = handled;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp7_) {
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = TRUE;
-#line 3516 "DirectPhotoPage.c"
+#line 3612 "DirectPhotoPage.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = event;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_);
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _tmp9_;
-#line 3526 "DirectPhotoPage.c"
+#line 3622 "DirectPhotoPage.c"
 	}
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp6_;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3532 "DirectPhotoPage.c"
+#line 3628 "DirectPhotoPage.c"
 }
 
 
@@ -3537,75 +3633,75 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 3555 "DirectPhotoPage.c"
+#line 3651 "DirectPhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3582 "DirectPhotoPage.c"
+#line 3678 "DirectPhotoPage.c"
 	}
 }
 
 
 static Block6Data* block6_data_ref (Block6Data* _data6_) {
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_atomic_int_inc (&_data6_->_ref_count_);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return _data6_;
-#line 3592 "DirectPhotoPage.c"
+#line 3688 "DirectPhotoPage.c"
 }
 
 
 static void block6_data_unref (void * _userdata_) {
 	Block6Data* _data6_;
 	_data6_ = (Block6Data*) _userdata_;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
-#line 3601 "DirectPhotoPage.c"
+#line 3697 "DirectPhotoPage.c"
 		DirectPhotoPage* self;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self = _data6_->self;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_slice_free (Block6Data, _data6_);
-#line 3609 "DirectPhotoPage.c"
+#line 3705 "DirectPhotoPage.c"
 	}
 }
 
@@ -3614,51 +3710,51 @@ static gboolean __lambda15_ (Block6Data* _data6_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = _data6_->self;
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _data6_->should_allow_rotation;
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3628 "DirectPhotoPage.c"
+#line 3724 "DirectPhotoPage.c"
 }
 
 
 static gboolean ___lambda15__gsource_func (gpointer self) {
 	gboolean result;
 	result = __lambda15_ (self);
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3637 "DirectPhotoPage.c"
+#line 3733 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
 	Block6Data* _data6_;
 	gboolean _tmp0_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = g_slice_new0 (Block6Data);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->_ref_count_ = 1;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->self = g_object_ref (self);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = should_allow_rotation;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->should_allow_rotation = _tmp0_;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block6_data_unref (_data6_);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = NULL;
-#line 3662 "DirectPhotoPage.c"
+#line 3758 "DirectPhotoPage.c"
 }
 
 
@@ -3667,19 +3763,19 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	DirectView* _tmp1_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = source;
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3683 "DirectPhotoPage.c"
+#line 3779 "DirectPhotoPage.c"
 }
 
 
@@ -3720,7 +3816,7 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 	((EditingHostPageClass *) klass)->create_photo_view = direct_photo_page_real_create_photo_view;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
-#line 3724 "DirectPhotoPage.c"
+#line 3820 "DirectPhotoPage.c"
 }
 
 
@@ -3731,7 +3827,7 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) {
 	self->priv->view_controller = NULL;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->drop_if_dirty = FALSE;
-#line 3735 "DirectPhotoPage.c"
+#line 3831 "DirectPhotoPage.c"
 }
 
 
@@ -3753,9 +3849,11 @@ static void direct_photo_page_finalize (GObject* obj) {
 	_data_collection_unref0 (self->priv->view_controller);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->current_save_dir);
+#line 154 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (self->priv->context_menu);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj);
-#line 3759 "DirectPhotoPage.c"
+#line 3857 "DirectPhotoPage.c"
 }
 
 
@@ -3774,46 +3872,46 @@ GType direct_photo_page_get_type (void) {
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) {
 	DirectFullscreenPhotoPage * self = NULL;
 	GFile* _tmp0_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 3786 "DirectPhotoPage.c"
+#line 3884 "DirectPhotoPage.c"
 }
 
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 3793 "DirectPhotoPage.c"
+#line 3891 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectFullscreenPhotoPage * self;
 	GeeList* _tmp0_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 3808 "DirectPhotoPage.c"
+#line 3906 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) {
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 3817 "DirectPhotoPage.c"
+#line 3915 "DirectPhotoPage.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index a48f9e0..14b54bc 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -146,12 +146,24 @@ public class DirectPhotoPage : EditingHostPage {
     }
 
     protected override bool on_context_buttonpress(Gdk.EventButton event) {
-//        Gtk.Menu context_menu = (Gtk.Menu) ui.get_widget("/DirectContextMenu");
-//        popup_context_menu(context_menu, event);
+        popup_context_menu(get_context_menu(), event);
 
         return true;
     }
 
+    private Gtk.Menu context_menu;
+
+    private Gtk.Menu get_context_menu() {
+        if (context_menu == null) {
+            var model = this.builder.get_object ("DirectContextMenu")
+                as GLib.MenuModel;
+            context_menu = new Gtk.Menu.from_model (model);
+            context_menu.attach_to_widget (this, null);
+        }
+
+        return this.context_menu;
+    }
+
     private void update_zoom_menu_item_sensitivity() {
         set_action_sensitive("IncreaseSize", !get_zoom_state().is_max() && !get_photo_missing());
         set_action_sensitive("DecreaseSize", !get_zoom_state().is_default() && !get_photo_missing());
@@ -348,8 +360,10 @@ public class DirectPhotoPage : EditingHostPage {
         DirectPhoto photo;
         DirectPhoto.global.fetch(dest, out photo, true);
 
-        DirectView tmp_view = new DirectView(photo);
-        view_controller.add(tmp_view);
+        if (!get_photo().equals(photo)) {
+            DirectView tmp_view = new DirectView(photo);
+            view_controller.add(tmp_view);
+        }
 
         DirectPhoto.global.reimport_photo(photo);
         display_mirror_of(view_controller, photo);
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index d1fe68f..b9d37d7 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -12676,7 +12676,7 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_active (_tmp12_, 0);
 #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");
+	_tmp13_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp13_);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index c3c79f6..d160f23 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -676,7 +676,7 @@ public class CropTool : EditingTool {
             constraint_combo.set_row_separator_func(constraint_combo_separator_func);
             constraint_combo.set_active(0);
 
-            var image = new Gtk.Image.from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
+            var image = new Gtk.Image.from_icon_name("crop-pivot-reticle", Gtk.IconSize.LARGE_TOOLBAR);
             pivot_reticle_button.set_image (image);
             pivot_reticle_button.set_tooltip_text(_("Pivot the crop rectangle between portrait and landscape orientations"));
 
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index b50047a..4f1606c 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1155,7 +1155,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1158 "EventDirectoryItem.c"
-			goto __catch51_g_error;
+			goto __catch52_g_error;
 		}
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
@@ -1163,8 +1163,8 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_object_unref0 (_tmp1_);
 #line 1165 "EventDirectoryItem.c"
 	}
-	goto __finally51;
-	__catch51_g_error:
+	goto __finally52;
+	__catch52_g_error:
 	{
 		GError* err = NULL;
 		Event* _tmp8_ = NULL;
@@ -1194,7 +1194,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_error_free0 (err);
 #line 1196 "EventDirectoryItem.c"
 	}
-	__finally51:
+	__finally52:
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1321,7 +1321,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1324 "EventDirectoryItem.c"
-				goto __catch52_g_error;
+				goto __catch53_g_error;
 			}
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
@@ -1329,8 +1329,8 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_object_unref0 (_tmp5_);
 #line 1331 "EventDirectoryItem.c"
 		}
-		goto __finally52;
-		__catch52_g_error:
+		goto __finally53;
+		__catch53_g_error:
 		{
 			GError* err = NULL;
 			Event* _tmp9_ = NULL;
@@ -1360,7 +1360,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_error_free0 (err);
 #line 1362 "EventDirectoryItem.c"
 		}
-		__finally52:
+		__finally53:
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 07c30d7..e304171 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -6597,7 +6597,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6599 "LibraryWindow.c"
-			goto __catch41_g_error;
+			goto __catch42_g_error;
 		}
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
@@ -6611,8 +6611,8 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_object_unref0 (_tmp9_);
 #line 6612 "LibraryWindow.c"
 	}
-	goto __finally41;
-	__catch41_g_error:
+	goto __finally42;
+	__catch42_g_error:
 	{
 		GError* err = NULL;
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6623,7 +6623,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_error_free0 (err);
 #line 6624 "LibraryWindow.c"
 	}
-	__finally41:
+	__finally42:
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8747,7 +8747,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 8749 "LibraryWindow.c"
-				goto __catch43_g_regex_error;
+				goto __catch44_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -8772,7 +8772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 8774 "LibraryWindow.c"
-				goto __catch43_g_regex_error;
+				goto __catch44_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -8798,8 +8798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 8799 "LibraryWindow.c"
 	}
-	goto __finally43;
-	__catch43_g_regex_error:
+	goto __finally44;
+	__catch44_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8812,7 +8812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 8813 "LibraryWindow.c"
 	}
-	__finally43:
+	__finally44:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8886,7 +8886,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8888 "LibraryWindow.c"
-			goto __catch42_g_error;
+			goto __catch43_g_error;
 		}
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
@@ -8900,8 +8900,8 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_g_object_unref0 (_tmp6_);
 #line 8901 "LibraryWindow.c"
 	}
-	goto __finally42;
-	__catch42_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -8926,7 +8926,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		return;
 #line 8927 "LibraryWindow.c"
 	}
-	__finally42:
+	__finally43:
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/main.c b/src/main.c
index d549d88..0b93c0c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -506,7 +506,6 @@ ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCance
 ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every);
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec);
-GFile* app_dirs_get_resources_dir (void);
 gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
 AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
@@ -697,25 +696,25 @@ GType shotwell_command_get_type (void) {
 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 114 "/home/jens/Source/shotwell/src/main.vala"
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 703 "main.c"
+#line 702 "main.c"
 }
 
 
 static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 712 "main.c"
+#line 711 "main.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 719 "main.c"
+#line 718 "main.c"
 }
 
 
@@ -741,55 +740,55 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	void* monitor_target = NULL;
 	GDestroyNotify monitor_target_destroy_notify = NULL;
 	gboolean _tmp39_ = FALSE;
-	AggregateProgressMonitor* _tmp79_ = NULL;
-	ProgressMonitor _tmp81_ = NULL;
-	void* _tmp81__target = NULL;
-	AggregateProgressMonitor* _tmp82_ = NULL;
-	ProgressMonitor _tmp84_ = NULL;
-	void* _tmp84__target = NULL;
-	AggregateProgressMonitor* _tmp85_ = NULL;
-	Upgrades* _tmp87_ = NULL;
-	Upgrades* _tmp88_ = NULL;
+	AggregateProgressMonitor* _tmp70_ = NULL;
+	ProgressMonitor _tmp72_ = NULL;
+	void* _tmp72__target = NULL;
+	AggregateProgressMonitor* _tmp73_ = NULL;
+	ProgressMonitor _tmp75_ = NULL;
+	void* _tmp75__target = NULL;
+	AggregateProgressMonitor* _tmp76_ = NULL;
+	Upgrades* _tmp78_ = NULL;
+	Upgrades* _tmp79_ = NULL;
 	MediaCollectionRegistry* registry = NULL;
-	MediaCollectionRegistry* _tmp89_ = NULL;
-	MediaCollectionRegistry* _tmp90_ = NULL;
-	LibraryPhotoSourceCollection* _tmp91_ = NULL;
-	MediaCollectionRegistry* _tmp92_ = NULL;
-	VideoSourceCollection* _tmp93_ = NULL;
-	AggregateProgressMonitor* _tmp94_ = NULL;
-	ProgressMonitor _tmp96_ = NULL;
-	void* _tmp96__target = NULL;
-	AggregateProgressMonitor* _tmp97_ = NULL;
-	ProgressMonitor _tmp99_ = NULL;
-	void* _tmp99__target = NULL;
-	Application* _tmp100_ = NULL;
-	Application* _tmp101_ = NULL;
-	AggregateProgressMonitor* _tmp102_ = NULL;
+	MediaCollectionRegistry* _tmp80_ = NULL;
+	MediaCollectionRegistry* _tmp81_ = NULL;
+	LibraryPhotoSourceCollection* _tmp82_ = NULL;
+	MediaCollectionRegistry* _tmp83_ = NULL;
+	VideoSourceCollection* _tmp84_ = NULL;
+	AggregateProgressMonitor* _tmp85_ = NULL;
+	ProgressMonitor _tmp87_ = NULL;
+	void* _tmp87__target = NULL;
+	AggregateProgressMonitor* _tmp88_ = NULL;
+	ProgressMonitor _tmp90_ = NULL;
+	void* _tmp90__target = NULL;
+	Application* _tmp91_ = NULL;
+	Application* _tmp92_ = NULL;
+	AggregateProgressMonitor* _tmp93_ = NULL;
 	LibraryWindow* library_window = NULL;
-	ProgressMonitor _tmp104_ = NULL;
-	void* _tmp104__target = NULL;
+	ProgressMonitor _tmp95_ = NULL;
+	void* _tmp95__target = NULL;
+	LibraryWindow* _tmp96_ = NULL;
+	AggregateProgressMonitor* _tmp97_ = NULL;
+	ProgressDialog* _tmp99_ = NULL;
+	gchar** _tmp101_ = NULL;
+	gint _tmp101__length1 = 0;
 	LibraryWindow* _tmp105_ = NULL;
-	AggregateProgressMonitor* _tmp106_ = NULL;
-	ProgressDialog* _tmp108_ = NULL;
-	gchar** _tmp110_ = NULL;
-	gint _tmp110__length1 = 0;
-	LibraryWindow* _tmp114_ = NULL;
 	WelcomeServiceEntry** selected_import_entries = NULL;
-	WelcomeServiceEntry** _tmp115_ = NULL;
+	WelcomeServiceEntry** _tmp106_ = NULL;
 	gint selected_import_entries_length1 = 0;
 	gint _selected_import_entries_size_ = 0;
-	gboolean _tmp116_ = FALSE;
-	ConfigFacade* _tmp117_ = NULL;
-	ConfigFacade* _tmp118_ = NULL;
-	gboolean _tmp119_ = FALSE;
-	gboolean _tmp120_ = FALSE;
-	WelcomeServiceEntry** _tmp134_ = NULL;
-	gint _tmp134__length1 = 0;
-	gboolean _tmp138_ = FALSE;
-	GTimer* _tmp139_ = NULL;
-	gdouble _tmp140_ = 0.0;
-	Application* _tmp141_ = NULL;
-	Application* _tmp142_ = NULL;
+	gboolean _tmp107_ = FALSE;
+	ConfigFacade* _tmp108_ = NULL;
+	ConfigFacade* _tmp109_ = NULL;
+	gboolean _tmp110_ = FALSE;
+	gboolean _tmp111_ = FALSE;
+	WelcomeServiceEntry** _tmp125_ = NULL;
+	gint _tmp125__length1 = 0;
+	gboolean _tmp129_ = FALSE;
+	GTimer* _tmp130_ = NULL;
+	gdouble _tmp131_ = 0.0;
+	Application* _tmp132_ = NULL;
+	Application* _tmp133_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 16 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = application_get_is_remote ();
@@ -799,7 +798,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_tmp1_ = was_already_running;
 #line 18 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 803 "main.c"
+#line 802 "main.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 #line 25 "/home/jens/Source/shotwell/src/main.vala"
@@ -812,7 +811,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		application_send_to_primary_instance (_tmp2_, _tmp2__length1);
 #line 27 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 816 "main.c"
+#line 815 "main.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_data_subdir ("data", NULL);
@@ -828,18 +827,18 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_g_object_unref0 (_tmp6_);
 #line 31 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp4_);
-#line 832 "main.c"
+#line 831 "main.c"
 	{
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		library_app_init (&_inner_error_);
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 838 "main.c"
-			goto __catch220_g_error;
+#line 837 "main.c"
+			goto __catch221_g_error;
 		}
 	}
-	goto __finally220;
-	__catch220_g_error:
+	goto __finally221;
+	__catch221_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -858,9 +857,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_error_free0 (err);
 #line 39 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 862 "main.c"
+#line 861 "main.c"
 	}
-	__finally220:
+	__finally221:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -869,7 +868,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		g_clear_error (&_inner_error_);
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 873 "main.c"
+#line 872 "main.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/main.vala"
 	g_message ("main.vala:43: Verifying database…");
@@ -891,15 +890,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	switch (_tmp12_) {
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_OK:
-#line 895 "main.c"
+#line 894 "main.c"
 		{
 #line 51 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 899 "main.c"
+#line 898 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 903 "main.c"
+#line 902 "main.c"
 		{
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -921,11 +920,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp16_;
 #line 56 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 923 "main.c"
+#line 922 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 927 "main.c"
+#line 926 "main.c"
 		{
 			const gchar* _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
@@ -947,11 +946,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp20_;
 #line 62 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 947 "main.c"
+#line 946 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 951 "main.c"
+#line 950 "main.c"
 		{
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -990,7 +989,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_g_object_unref0 (_tmp25_);
 #line 68 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 987 "main.c"
+#line 986 "main.c"
 		}
 		default:
 		{
@@ -1012,14 +1011,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp32_;
 #line 73 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 1009 "main.c"
+#line 1008 "main.c"
 		}
 	}
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp33_ = errormsg;
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp33_ != NULL) {
-#line 1016 "main.c"
+#line 1015 "main.c"
 		GtkMessageDialog* dialog = NULL;
 		const gchar* _tmp34_ = NULL;
 		GtkMessageDialog* _tmp35_ = NULL;
@@ -1056,7 +1055,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_free0 (errormsg);
 #line 85 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1053 "main.c"
+#line 1052 "main.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/main.vala"
 	upgrades_init ();
@@ -1074,7 +1073,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_tmp39_ = commandline_options_no_startup_progress;
 #line 94 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp39_) {
-#line 1071 "main.c"
+#line 1070 "main.c"
 		guint64 grand_total = 0ULL;
 		PhotoTable* _tmp40_ = NULL;
 		PhotoTable* _tmp41_ = NULL;
@@ -1141,15 +1140,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_tmp56_ = grand_total;
 #line 103 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp56_ > ((guint64) 5000)) {
-#line 1138 "main.c"
+#line 1137 "main.c"
 			const gchar* _tmp57_ = NULL;
 			ProgressDialog* _tmp58_ = NULL;
 			ProgressDialog* _tmp59_ = NULL;
 			ProgressDialog* _tmp60_ = NULL;
-			guint64 _tmp75_ = 0ULL;
-			ProgressDialog* _tmp76_ = NULL;
-			AggregateProgressMonitor* _tmp77_ = NULL;
-			AggregateProgressMonitor* _tmp78_ = NULL;
+			guint64 _tmp66_ = 0ULL;
+			ProgressDialog* _tmp67_ = NULL;
+			AggregateProgressMonitor* _tmp68_ = NULL;
+			AggregateProgressMonitor* _tmp69_ = NULL;
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp57_ = _ ("Loading Shotwell");
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
@@ -1168,90 +1167,50 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_tmp60_ = progress_dialog;
 #line 106 "/home/jens/Source/shotwell/src/main.vala"
 			progress_dialog_set_minimum_on_screen_time_msec (_tmp60_, 250);
-#line 1165 "main.c"
+#line 1164 "main.c"
 			{
-				gchar* icon_path = NULL;
-				GFile* _tmp61_ = NULL;
-				GFile* _tmp62_ = NULL;
-				GFile* _tmp63_ = NULL;
-				GFile* _tmp64_ = NULL;
-				GFile* _tmp65_ = NULL;
-				GFile* _tmp66_ = NULL;
-				gchar* _tmp67_ = NULL;
-				gchar* _tmp68_ = NULL;
-				GdkPixbuf* _tmp69_ = NULL;
-				const gchar* _tmp70_ = NULL;
-				GdkPixbuf* _tmp71_ = NULL;
-				ProgressDialog* _tmp72_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp61_ = app_dirs_get_resources_dir ();
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp62_ = _tmp61_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp63_ = g_file_get_child (_tmp62_, "icons");
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp64_ = _tmp63_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp65_ = g_file_get_child (_tmp64_, "shotwell.svg");
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp66_ = _tmp65_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp67_ = g_file_get_path (_tmp66_);
+				GdkPixbuf* _tmp61_ = NULL;
+				GdkPixbuf* _tmp62_ = NULL;
+				ProgressDialog* _tmp63_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp68_ = _tmp67_;
+				_tmp62_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp66_);
+				_tmp61_ = _tmp62_;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp64_);
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp62_);
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				icon_path = _tmp68_;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp70_ = icon_path;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp71_ = gdk_pixbuf_new_from_file (_tmp70_, &_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp69_ = _tmp71_;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-					_g_free0 (icon_path);
-#line 1214 "main.c"
-					goto __catch221_g_error;
+#line 1175 "main.c"
+					goto __catch222_g_error;
 				}
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp72_ = progress_dialog;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_window_get_type (), GtkWindow), _tmp69_);
-#line 107 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp69_);
+#line 108 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp63_ = progress_dialog;
+#line 108 "/home/jens/Source/shotwell/src/main.vala"
+				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _tmp61_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
-				_g_free0 (icon_path);
-#line 1225 "main.c"
+				_g_object_unref0 (_tmp61_);
+#line 1184 "main.c"
 			}
-			goto __finally221;
-			__catch221_g_error:
+			goto __finally222;
+			__catch222_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp73_ = NULL;
-				const gchar* _tmp74_ = NULL;
+				GError* _tmp64_ = NULL;
+				const gchar* _tmp65_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				err = _inner_error_;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_inner_error_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp73_ = err;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp74_ = _tmp73_->message;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				g_debug ("main.vala:111: Warning - could not load application icon for loading w" \
-"indow: %s", _tmp74_);
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp64_ = err;
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp65_ = _tmp64_->message;
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				g_debug ("main.vala:110: Warning - could not load application icon for loading w" \
+"indow: %s", _tmp65_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_g_error_free0 (err);
-#line 1245 "main.c"
+#line 1204 "main.c"
 			}
-			__finally221:
+			__finally222:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1276,461 +1235,461 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				return;
-#line 1272 "main.c"
+#line 1231 "main.c"
 			}
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp75_ = grand_total;
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp76_ = progress_dialog;
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp77_ = aggregate_progress_monitor_new (_tmp75_, _progress_dialog_monitor_progress_monitor, _tmp76_);
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp66_ = grand_total;
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp67_ = progress_dialog;
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp68_ = aggregate_progress_monitor_new (_tmp66_, _progress_dialog_monitor_progress_monitor, _tmp67_);
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
 			_aggregate_progress_monitor_unref0 (aggregate_monitor);
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			aggregate_monitor = _tmp68_;
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp69_ = aggregate_monitor;
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
-			aggregate_monitor = _tmp77_;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp78_ = aggregate_monitor;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
 			(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor = _aggregate_progress_monitor_monitor_progress_monitor;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
-			monitor_target = aggregate_progress_monitor_ref (_tmp78_);
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
+			monitor_target = aggregate_progress_monitor_ref (_tmp69_);
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1300 "main.c"
+#line 1259 "main.c"
 		}
 	}
-#line 119 "/home/jens/Source/shotwell/src/main.vala"
+#line 118 "/home/jens/Source/shotwell/src/main.vala"
 	thumbnail_cache_init ();
-#line 120 "/home/jens/Source/shotwell/src/main.vala"
+#line 119 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_init ();
+#line 121 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp70_ = aggregate_monitor;
+#line 121 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp70_ != NULL) {
+#line 1270 "main.c"
+		AggregateProgressMonitor* _tmp71_ = NULL;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp79_ = aggregate_monitor;
+		_tmp71_ = aggregate_monitor;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp79_ != NULL) {
-#line 1311 "main.c"
-		AggregateProgressMonitor* _tmp80_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp71_, "LibraryPhoto.init");
+#line 1276 "main.c"
+	}
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp80_ = aggregate_monitor;
+	_tmp72_ = monitor;
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp80_, "LibraryPhoto.init");
-#line 1317 "main.c"
-	}
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp81_ = monitor;
+	_tmp72__target = monitor_target;
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
+	library_photo_init (_tmp72_, _tmp72__target);
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp81__target = monitor_target;
+	_tmp73_ = aggregate_monitor;
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	library_photo_init (_tmp81_, _tmp81__target);
+	if (_tmp73_ != NULL) {
+#line 1288 "main.c"
+		AggregateProgressMonitor* _tmp74_ = NULL;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp82_ = aggregate_monitor;
+		_tmp74_ = aggregate_monitor;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp82_ != NULL) {
-#line 1329 "main.c"
-		AggregateProgressMonitor* _tmp83_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp74_, "Video.init");
+#line 1294 "main.c"
+	}
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp83_ = aggregate_monitor;
+	_tmp75_ = monitor;
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp83_, "Video.init");
-#line 1335 "main.c"
-	}
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp84_ = monitor;
+	_tmp75__target = monitor_target;
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
+	video_init (_tmp75_, _tmp75__target);
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp84__target = monitor_target;
+	_tmp76_ = aggregate_monitor;
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	video_init (_tmp84_, _tmp84__target);
+	if (_tmp76_ != NULL) {
+#line 1306 "main.c"
+		AggregateProgressMonitor* _tmp77_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp85_ = aggregate_monitor;
+		_tmp77_ = aggregate_monitor;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp85_ != NULL) {
-#line 1347 "main.c"
-		AggregateProgressMonitor* _tmp86_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp77_, "Upgrades.execute");
+#line 1312 "main.c"
+	}
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp86_ = aggregate_monitor;
+	_tmp78_ = upgrades_get_instance ();
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp86_, "Upgrades.execute");
-#line 1353 "main.c"
-	}
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp87_ = upgrades_get_instance ();
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp88_ = _tmp87_;
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	upgrades_execute (_tmp88_, NULL, NULL);
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_upgrades_unref0 (_tmp88_);
-#line 132 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp79_ = _tmp78_;
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
+	upgrades_execute (_tmp79_, NULL, NULL);
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
+	_upgrades_unref0 (_tmp79_);
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_init ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 132 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_init ();
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp80_ = media_collection_registry_get_instance ();
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
+	registry = _tmp80_;
+#line 134 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp81_ = registry;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp89_ = media_collection_registry_get_instance ();
+	_tmp82_ = library_photo_global;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	registry = _tmp89_;
+	media_collection_registry_register_collection (_tmp81_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp90_ = registry;
+	_tmp83_ = registry;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp91_ = library_photo_global;
+	_tmp84_ = video_global;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp90_, G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp92_ = registry;
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp93_ = video_global;
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp92_, G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+	media_collection_registry_register_collection (_tmp83_, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp85_ = aggregate_monitor;
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp85_ != NULL) {
+#line 1346 "main.c"
+		AggregateProgressMonitor* _tmp86_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp94_ = aggregate_monitor;
+		_tmp86_ = aggregate_monitor;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp94_ != NULL) {
-#line 1387 "main.c"
-		AggregateProgressMonitor* _tmp95_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp86_, "Event.init");
+#line 1352 "main.c"
+	}
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp95_ = aggregate_monitor;
+	_tmp87_ = monitor;
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp95_, "Event.init");
-#line 1393 "main.c"
-	}
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp96_ = monitor;
+	_tmp87__target = monitor_target;
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
+	event_init (_tmp87_, _tmp87__target);
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp96__target = monitor_target;
+	_tmp88_ = aggregate_monitor;
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	event_init (_tmp96_, _tmp96__target);
+	if (_tmp88_ != NULL) {
+#line 1364 "main.c"
+		AggregateProgressMonitor* _tmp89_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp97_ = aggregate_monitor;
+		_tmp89_ = aggregate_monitor;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp97_ != NULL) {
-#line 1405 "main.c"
-		AggregateProgressMonitor* _tmp98_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp89_, "Tag.init");
+#line 1370 "main.c"
+	}
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp98_ = aggregate_monitor;
+	_tmp90_ = monitor;
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp98_, "Tag.init");
-#line 1411 "main.c"
-	}
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp99_ = monitor;
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp99__target = monitor_target;
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	tag_init (_tmp99_, _tmp99__target);
-#line 145 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp90__target = monitor_target;
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
+	tag_init (_tmp90_, _tmp90__target);
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_init ();
-#line 146 "/home/jens/Source/shotwell/src/main.vala"
+#line 145 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp100_ = application_get_instance ();
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp101_ = _tmp100_;
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	g_signal_emit_by_name (_tmp101_, "init-done");
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp101_);
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp91_ = application_get_instance ();
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp92_ = _tmp91_;
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	g_signal_emit_by_name (_tmp92_, "init-done");
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp92_);
+#line 150 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp93_ = aggregate_monitor;
+#line 150 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp93_ != NULL) {
+#line 1394 "main.c"
+		AggregateProgressMonitor* _tmp94_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp102_ = aggregate_monitor;
+		_tmp94_ = aggregate_monitor;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp102_ != NULL) {
-#line 1435 "main.c"
-		AggregateProgressMonitor* _tmp103_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp94_, "LibraryWindow");
+#line 1400 "main.c"
+	}
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp103_ = aggregate_monitor;
+	_tmp95_ = monitor;
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp103_, "LibraryWindow");
-#line 1441 "main.c"
-	}
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp104_ = monitor;
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp104__target = monitor_target;
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp105_ = library_window_new (_tmp104_, _tmp104__target);
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	g_object_ref_sink (_tmp105_);
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	library_window = _tmp105_;
+	_tmp95__target = monitor_target;
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp96_ = library_window_new (_tmp95_, _tmp95__target);
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	g_object_ref_sink (_tmp96_);
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	library_window = _tmp96_;
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp97_ = aggregate_monitor;
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp97_ != NULL) {
+#line 1416 "main.c"
+		AggregateProgressMonitor* _tmp98_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp106_ = aggregate_monitor;
+		_tmp98_ = aggregate_monitor;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp106_ != NULL) {
-#line 1457 "main.c"
-		AggregateProgressMonitor* _tmp107_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp107_ = aggregate_monitor;
-#line 156 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp107_, "done");
-#line 1463 "main.c"
+		aggregate_progress_monitor_next_step (_tmp98_, "done");
+#line 1422 "main.c"
 	}
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 161 "/home/jens/Source/shotwell/src/main.vala"
 	_aggregate_progress_monitor_unref0 (aggregate_monitor);
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 161 "/home/jens/Source/shotwell/src/main.vala"
 	aggregate_monitor = NULL;
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp99_ = progress_dialog;
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp99_ != NULL) {
+#line 1446 "main.c"
+		ProgressDialog* _tmp100_ = NULL;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp108_ = progress_dialog;
+		_tmp100_ = progress_dialog;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp108_ != NULL) {
-#line 1487 "main.c"
-		ProgressDialog* _tmp109_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp109_ = progress_dialog;
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget));
-#line 1493 "main.c"
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
+#line 1452 "main.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (progress_dialog);
-#line 165 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	progress_dialog = NULL;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp110_ = mounts;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp110__length1 = mounts_length1;
-#line 1503 "main.c"
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp101_ = mounts;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp101__length1 = mounts_length1;
+#line 1462 "main.c"
 	{
 		gchar** mount_collection = NULL;
 		gint mount_collection_length1 = 0;
 		gint _mount_collection_size_ = 0;
 		gint mount_it = 0;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection = _tmp110_;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection_length1 = _tmp110__length1;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		for (mount_it = 0; mount_it < _tmp110__length1; mount_it = mount_it + 1) {
-#line 1515 "main.c"
-			gchar* _tmp111_ = NULL;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		mount_collection = _tmp101_;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		mount_collection_length1 = _tmp101__length1;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		for (mount_it = 0; mount_it < _tmp101__length1; mount_it = mount_it + 1) {
+#line 1474 "main.c"
+			gchar* _tmp102_ = NULL;
 			gchar* mount = NULL;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp102_ = g_strdup (mount_collection[mount_it]);
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+			mount = _tmp102_;
+#line 1481 "main.c"
+			{
+				LibraryWindow* _tmp103_ = NULL;
+				const gchar* _tmp104_ = NULL;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp111_ = g_strdup (mount_collection[mount_it]);
+				_tmp103_ = library_window;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-			mount = _tmp111_;
-#line 1522 "main.c"
-			{
-				LibraryWindow* _tmp112_ = NULL;
-				const gchar* _tmp113_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp112_ = library_window;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp113_ = mount;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				library_window_mounted_camera_shell_notification (_tmp112_, _tmp113_, TRUE);
+				_tmp104_ = mount;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
+				library_window_mounted_camera_shell_notification (_tmp103_, _tmp104_, TRUE);
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (mount);
-#line 1534 "main.c"
+#line 1493 "main.c"
 			}
 		}
 	}
-#line 171 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp114_ = library_window;
-#line 171 "/home/jens/Source/shotwell/src/main.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget));
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp105_ = library_window;
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget));
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp106_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	selected_import_entries = _tmp106_;
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	selected_import_entries_length1 = 0;
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	_selected_import_entries_size_ = selected_import_entries_length1;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp115_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+	_tmp108_ = config_facade_get_instance ();
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	selected_import_entries = _tmp115_;
+	_tmp109_ = _tmp108_;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	selected_import_entries_length1 = 0;
+	_tmp110_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_selected_import_entries_size_ = selected_import_entries_length1;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp117_ = config_facade_get_instance ();
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp118_ = _tmp117_;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp119_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp111_ = _tmp110_;
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	_g_object_unref0 (_tmp109_);
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp111_) {
+#line 1521 "main.c"
+		LibraryPhotoSourceCollection* _tmp112_ = NULL;
+		gint _tmp113_ = 0;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp120_ = _tmp119_;
+		_tmp112_ = library_photo_global;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_g_object_unref0 (_tmp118_);
+		_tmp113_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_COLLECTION, DataCollection));
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp120_) {
-#line 1562 "main.c"
-		LibraryPhotoSourceCollection* _tmp121_ = NULL;
-		gint _tmp122_ = 0;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp121_ = library_photo_global;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp122_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_DATA_COLLECTION, DataCollection));
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp116_ = _tmp122_ == 0;
-#line 1571 "main.c"
+		_tmp107_ = _tmp113_ == 0;
+#line 1530 "main.c"
 	} else {
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp116_ = FALSE;
-#line 1575 "main.c"
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp107_ = FALSE;
+#line 1534 "main.c"
 	}
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp116_) {
-#line 1579 "main.c"
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp107_) {
+#line 1538 "main.c"
 		WelcomeDialog* welcome = NULL;
-		LibraryWindow* _tmp123_ = NULL;
-		WelcomeDialog* _tmp124_ = NULL;
-		ConfigFacade* _tmp125_ = NULL;
-		ConfigFacade* _tmp126_ = NULL;
-		WelcomeDialog* _tmp127_ = NULL;
-		WelcomeServiceEntry** _tmp128_ = NULL;
-		gint _tmp129_ = 0;
-		gboolean _tmp130_ = FALSE;
-		gboolean _tmp131_ = FALSE;
+		LibraryWindow* _tmp114_ = NULL;
+		WelcomeDialog* _tmp115_ = NULL;
+		ConfigFacade* _tmp116_ = NULL;
+		ConfigFacade* _tmp117_ = NULL;
+		WelcomeDialog* _tmp118_ = NULL;
+		WelcomeServiceEntry** _tmp119_ = NULL;
+		gint _tmp120_ = 0;
+		gboolean _tmp121_ = FALSE;
+		gboolean _tmp122_ = FALSE;
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp114_ = library_window;
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp115_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_window_get_type (), GtkWindow));
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		g_object_ref_sink (_tmp115_);
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		welcome = _tmp115_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp123_ = library_window;
+		_tmp116_ = config_facade_get_instance ();
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp124_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_window_get_type (), GtkWindow));
+		_tmp117_ = _tmp116_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		g_object_ref_sink (_tmp124_);
+		_tmp118_ = welcome;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp122_ = welcome_dialog_execute (_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_);
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		welcome = _tmp124_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp125_ = config_facade_get_instance ();
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp126_ = _tmp125_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp127_ = welcome;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp131_ = welcome_dialog_execute (_tmp127_, &_tmp128_, &_tmp129_, &_tmp130_);
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
 		selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries = _tmp128_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries_length1 = _tmp129_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		selected_import_entries = _tmp119_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		selected_import_entries_length1 = _tmp120_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_selected_import_entries_size_ = selected_import_entries_length1;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		do_system_pictures_import = _tmp130_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp131_);
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp126_);
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		do_system_pictures_import = _tmp121_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp122_);
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp117_);
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (welcome);
-#line 1622 "main.c"
+#line 1581 "main.c"
 	} else {
-		ConfigFacade* _tmp132_ = NULL;
-		ConfigFacade* _tmp133_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp132_ = config_facade_get_instance ();
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp133_ = _tmp132_;
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp133_);
-#line 1634 "main.c"
+		ConfigFacade* _tmp123_ = NULL;
+		ConfigFacade* _tmp124_ = NULL;
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp123_ = config_facade_get_instance ();
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp124_ = _tmp123_;
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp124_);
+#line 1593 "main.c"
 	}
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp125_ = selected_import_entries;
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp125__length1 = selected_import_entries_length1;
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp125__length1 > 0) {
+#line 1601 "main.c"
+		WelcomeServiceEntry** _tmp126_ = NULL;
+		gint _tmp126__length1 = 0;
 #line 183 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp134_ = selected_import_entries;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp134__length1 = selected_import_entries_length1;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp134__length1 > 0) {
-#line 1642 "main.c"
-		WelcomeServiceEntry** _tmp135_ = NULL;
-		gint _tmp135__length1 = 0;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
 		do_external_import = TRUE;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp135_ = selected_import_entries;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp135__length1 = selected_import_entries_length1;
-#line 1651 "main.c"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp126_ = selected_import_entries;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp126__length1 = selected_import_entries_length1;
+#line 1610 "main.c"
 		{
 			WelcomeServiceEntry** entry_collection = NULL;
 			gint entry_collection_length1 = 0;
 			gint _entry_collection_size_ = 0;
 			gint entry_it = 0;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection = _tmp135_;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection_length1 = _tmp135__length1;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			for (entry_it = 0; entry_it < _tmp135__length1; entry_it = entry_it + 1) {
-#line 1663 "main.c"
-				WelcomeServiceEntry* _tmp136_ = NULL;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			entry_collection = _tmp126_;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			entry_collection_length1 = _tmp126__length1;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			for (entry_it = 0; entry_it < _tmp126__length1; entry_it = entry_it + 1) {
+#line 1622 "main.c"
+				WelcomeServiceEntry* _tmp127_ = NULL;
 				WelcomeServiceEntry* entry = NULL;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp136_ = _g_object_ref0 (entry_collection[entry_it]);
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-				entry = _tmp136_;
-#line 1670 "main.c"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp127_ = _g_object_ref0 (entry_collection[entry_it]);
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+				entry = _tmp127_;
+#line 1629 "main.c"
 				{
-					WelcomeServiceEntry* _tmp137_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp137_ = entry;
-#line 186 "/home/jens/Source/shotwell/src/main.vala"
-					welcome_service_entry_execute (_tmp137_);
+					WelcomeServiceEntry* _tmp128_ = NULL;
 #line 185 "/home/jens/Source/shotwell/src/main.vala"
+					_tmp128_ = entry;
+#line 185 "/home/jens/Source/shotwell/src/main.vala"
+					welcome_service_entry_execute (_tmp128_);
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 					_g_object_unref0 (entry);
-#line 1679 "main.c"
+#line 1638 "main.c"
 				}
 			}
 		}
 	}
-#line 188 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp138_ = do_system_pictures_import;
-#line 188 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp138_) {
-#line 192 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp129_ = do_system_pictures_import;
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp129_) {
+#line 191 "/home/jens/Source/shotwell/src/main.vala"
 		run_system_pictures_import (NULL);
-#line 1690 "main.c"
+#line 1649 "main.c"
 	}
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp139_ = startup_timer;
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp140_ = g_timer_elapsed (_tmp139_, NULL);
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:195: %lf seconds to Gtk.main()", _tmp140_);
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp141_ = application_get_instance ();
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp142_ = _tmp141_;
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	application_start (_tmp142_, NULL, 0);
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp142_);
-#line 199 "/home/jens/Source/shotwell/src/main.vala"
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp130_ = startup_timer;
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp131_ = g_timer_elapsed (_tmp130_, NULL);
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp131_);
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp132_ = application_get_instance ();
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp133_ = _tmp132_;
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	application_start (_tmp133_, NULL, 0);
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp133_);
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
-#line 200 "/home/jens/Source/shotwell/src/main.vala"
+#line 199 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_terminate ();
-#line 201 "/home/jens/Source/shotwell/src/main.vala"
+#line 200 "/home/jens/Source/shotwell/src/main.vala"
 	tag_terminate ();
-#line 202 "/home/jens/Source/shotwell/src/main.vala"
+#line 201 "/home/jens/Source/shotwell/src/main.vala"
 	event_terminate ();
-#line 203 "/home/jens/Source/shotwell/src/main.vala"
+#line 202 "/home/jens/Source/shotwell/src/main.vala"
 	library_photo_terminate ();
-#line 204 "/home/jens/Source/shotwell/src/main.vala"
+#line 203 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_terminate ();
-#line 205 "/home/jens/Source/shotwell/src/main.vala"
+#line 204 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_terminate ();
-#line 206 "/home/jens/Source/shotwell/src/main.vala"
+#line 205 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_terminate ();
-#line 207 "/home/jens/Source/shotwell/src/main.vala"
+#line 206 "/home/jens/Source/shotwell/src/main.vala"
 	thumbnail_cache_terminate ();
-#line 208 "/home/jens/Source/shotwell/src/main.vala"
+#line 207 "/home/jens/Source/shotwell/src/main.vala"
 	video_terminate ();
-#line 209 "/home/jens/Source/shotwell/src/main.vala"
+#line 208 "/home/jens/Source/shotwell/src/main.vala"
 	library_app_terminate ();
 #line 15 "/home/jens/Source/shotwell/src/main.vala"
 	selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -1754,14 +1713,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_g_free0 (app_version);
 #line 15 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (errormsg);
-#line 1750 "main.c"
+#line 1709 "main.c"
 }
 
 
 static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	report_system_pictures_import (manifest, import_roll);
-#line 1757 "main.c"
+#line 1716 "main.c"
 }
 
 
@@ -1783,65 +1742,65 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 	LibraryWindow* _tmp11_ = NULL;
 	BatchImport* _tmp12_ = NULL;
 	LibraryWindow* _tmp13_ = NULL;
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest));
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 215 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = do_system_pictures_import;
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 215 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp0_) {
-#line 217 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1787 "main.c"
+#line 1746 "main.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
 	jobs = _tmp1_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = jobs;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_import_dir ();
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = file_import_job_new (_tmp4_, FALSE);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = _tmp5_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_batch_import_job_unref0 (_tmp6_);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp4_);
-#line 222 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 222 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = jobs;
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = external_exclusion_manifest;
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable), "startup_import", _report_system_pictures_import_batch_import_import_reporter, NULL, NULL, NULL, NULL, NULL, _tmp9_);
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	batch_import = _tmp10_;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = library_window;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = batch_import;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
-#line 228 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = library_window;
-#line 228 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	library_window_switch_to_import_queue_page (_tmp13_);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (batch_import);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (library_window);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (jobs);
-#line 1837 "main.c"
+#line 1796 "main.c"
 }
 
 
@@ -1849,46 +1808,46 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	ImportManifest* _tmp6_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/main.vala"
+#line 230 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 231 "/home/jens/Source/shotwell/src/main.vala"
+#line 230 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = do_external_import;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 1853 "main.c"
+#line 1812 "main.c"
 		ImportManifest* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = manifest;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_->all;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = _tmp4_;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = _tmp5_ == 0;
-#line 1868 "main.c"
+#line 1827 "main.c"
 	} else {
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = FALSE;
-#line 1872 "main.c"
+#line 1831 "main.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_) {
-#line 239 "/home/jens/Source/shotwell/src/main.vala"
+#line 238 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1878 "main.c"
+#line 1837 "main.c"
 	}
-#line 241 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = manifest;
-#line 241 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
 	import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1884 "main.c"
+#line 1843 "main.c"
 }
 
 
@@ -1906,193 +1865,193 @@ void editing_exec (const gchar* filename) {
 	Application* _tmp10_ = NULL;
 	Application* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (filename != NULL);
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = filename;
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	initial_file = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 247 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = initial_file;
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 247 "/home/jens/Source/shotwell/src/main.vala"
 	direct_preconfigure (_tmp2_);
-#line 249 "/home/jens/Source/shotwell/src/main.vala"
+#line 248 "/home/jens/Source/shotwell/src/main.vala"
 	db_preconfigure (NULL);
-#line 1916 "main.c"
+#line 1875 "main.c"
 	{
-#line 253 "/home/jens/Source/shotwell/src/main.vala"
+#line 252 "/home/jens/Source/shotwell/src/main.vala"
 		direct_app_init (&_inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/main.vala"
+#line 252 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1922 "main.c"
-			goto __catch222_g_error;
+#line 1881 "main.c"
+			goto __catch223_g_error;
 		}
 	}
-	goto __finally222;
-	__catch222_g_error:
+	goto __finally223;
+	__catch223_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		err = _inner_error_;
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		_inner_error_ = NULL;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = err;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = _tmp3_->message;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		app_window_panic (_tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (err);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1948 "main.c"
+#line 1907 "main.c"
 	}
-	__finally222:
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+	__finally223:
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		g_critical ("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 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1961 "main.c"
+#line 1920 "main.c"
 	}
-#line 261 "/home/jens/Source/shotwell/src/main.vala"
+#line 260 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = initial_file;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = direct_window_new (_tmp5_);
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	g_object_ref_sink (_tmp6_);
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	direct_window = _tmp6_;
-#line 268 "/home/jens/Source/shotwell/src/main.vala"
+#line 267 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = direct_window;
-#line 268 "/home/jens/Source/shotwell/src/main.vala"
+#line 267 "/home/jens/Source/shotwell/src/main.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 270 "/home/jens/Source/shotwell/src/main.vala"
+#line 269 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = startup_timer;
-#line 270 "/home/jens/Source/shotwell/src/main.vala"
+#line 269 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
-#line 270 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:270: %lf seconds to Gtk.main()", _tmp9_);
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 269 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:269: %lf seconds to Gtk.main()", _tmp9_);
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_ = application_get_instance ();
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = _tmp10_;
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	application_start (_tmp11_, NULL, 0);
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	_application_unref0 (_tmp11_);
-#line 274 "/home/jens/Source/shotwell/src/main.vala"
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
-#line 277 "/home/jens/Source/shotwell/src/main.vala"
+#line 276 "/home/jens/Source/shotwell/src/main.vala"
 	direct_app_terminate ();
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (direct_window);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (initial_file);
-#line 1999 "main.c"
+#line 1958 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2006 "main.c"
+#line 1965 "main.c"
 }
 
 
 static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2017 "main.c"
+#line 1976 "main.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2021 "main.c"
+#line 1980 "main.c"
 }
 
 
 static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2032 "main.c"
+#line 1991 "main.c"
 	}
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2036 "main.c"
+#line 1995 "main.c"
 }
 
 
 static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2047 "main.c"
+#line 2006 "main.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2051 "main.c"
+#line 2010 "main.c"
 }
 
 
 static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2062 "main.c"
+#line 2021 "main.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2066 "main.c"
+#line 2025 "main.c"
 }
 
 
 static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2077 "main.c"
+#line 2036 "main.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2081 "main.c"
+#line 2040 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2088 "main.c"
+#line 2047 "main.c"
 }
 
 
@@ -2136,213 +2095,213 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 	gint _tmp25__length1 = 0;
 	GOptionEntry* _tmp26_ = NULL;
 	gint _tmp26__length1 = 0;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = commandline_options_entries;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = commandline_options_entries_length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_ != NULL) {
-#line 2138 "main.c"
+#line 2097 "main.c"
 		GOptionEntry* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		GOptionEntry* _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 		GOptionEntry* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1_ = commandline_options_entries;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1__length1 = commandline_options_entries_length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup26 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2__length1 = _tmp1__length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3__length1 = _tmp2__length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		if (result_length1) {
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 			*result_length1 = _tmp3__length1;
-#line 2161 "main.c"
+#line 2120 "main.c"
 		}
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		result = _tmp3_;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		return result;
-#line 2167 "main.c"
+#line 2126 "main.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _ ("Path to Shotwell’s private data");
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = _ ("DIRECTORY");
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.long_name = "datadir";
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.short_name = 'd';
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.flags = 0;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg = G_OPTION_ARG_FILENAME;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg_data = &commandline_options_data_dir;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.description = _tmp4_;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg_description = _tmp5_;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	datadir = _tmp6_;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = commandline_options_entries;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7__length1 = commandline_options_entries_length1;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = datadir;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = _ ("Do not monitor library directory at runtime for changes");
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.long_name = "no-runtime-monitoring";
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.short_name = (gchar) 0;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.flags = 0;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg = G_OPTION_ARG_NONE;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_data = &commandline_options_no_runtime_monitoring;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.description = _tmp9_;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_description = NULL;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	no_monitoring = _tmp10_;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = commandline_options_entries;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11__length1 = commandline_options_entries_length1;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = no_monitoring;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = _ ("Don’t display startup progress meter");
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.long_name = "no-startup-progress";
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.short_name = (gchar) 0;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.flags = 0;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg = G_OPTION_ARG_NONE;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg_data = &commandline_options_no_startup_progress;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.description = _tmp13_;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg_description = NULL;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	no_startup = _tmp14_;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15_ = commandline_options_entries;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15__length1 = commandline_options_entries_length1;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_ = no_startup;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp17_ = _ ("Show the application’s version");
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.long_name = "version";
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.short_name = 'V';
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.flags = 0;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg = G_OPTION_ARG_NONE;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg_data = &commandline_options_show_version;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.description = _tmp17_;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg_description = NULL;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	version = _tmp18_;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp19_ = commandline_options_entries;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp19__length1 = commandline_options_entries_length1;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp20_ = version;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_);
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.long_name = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.short_name = (gchar) 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.flags = 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg = 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg_data = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.description = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg_description = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	terminator = _tmp21_;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22_ = commandline_options_entries;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22__length1 = commandline_options_entries_length1;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp23_ = terminator;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_);
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp24_ = commandline_options_entries;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp24__length1 = commandline_options_entries_length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup27 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp25__length1 = _tmp24__length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp26_ = _tmp25_;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp26__length1 = _tmp25__length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	if (result_length1) {
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 		*result_length1 = _tmp26__length1;
-#line 2315 "main.c"
+#line 2274 "main.c"
 	}
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	result = _tmp26_;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 2321 "main.c"
+#line 2280 "main.c"
 }
 
 
 static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2332 "main.c"
+#line 2291 "main.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = value;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[*length] = NULL;
-#line 2338 "main.c"
+#line 2297 "main.c"
 }
 
 
@@ -2362,7 +2321,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2358 "main.c"
+#line 2317 "main.c"
 }
 
 
@@ -2398,54 +2357,58 @@ void _vala_main (gchar** args, int args_length1) {
 	const gchar* _tmp68_ = NULL;
 	gboolean _tmp69_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = args;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = args_length1;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = _tmp0_[0];
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_init (_tmp1_);
-#line 325 "/home/jens/Source/shotwell/src/main.vala"
+#line 324 "/home/jens/Source/shotwell/src/main.vala"
 	gexiv2_initialize ();
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	gexiv2_log_use_glib_logging ();
+#line 329 "/home/jens/Source/shotwell/src/main.vala"
+	gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG);
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = app_dirs_get_install_dir ();
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_ == NULL;
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp4_) {
-#line 2414 "main.c"
+#line 2377 "main.c"
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = app_dirs_get_exec_dir ();
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp6_ = _tmp5_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp8_ = _tmp7_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp9_ = g_strconcat (_tmp8_, "/misc", NULL);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp10_ = _tmp9_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp10_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp8_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2441 "main.c"
+#line 2404 "main.c"
 	}
 	{
 		const gchar* _tmp11_ = NULL;
@@ -2453,26 +2416,26 @@ void _vala_main (gchar** args, int args_length1) {
 		GOptionEntry* _tmp13_ = NULL;
 		GOptionEntry* _tmp14_ = NULL;
 		gint _tmp14__length1 = 0;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp11_ = _ ("[FILE]");
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp13_ = commandline_options_get_options (&_tmp12_);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14_ = _tmp13_;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14__length1 = _tmp12_;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		gtk_init_with_args (&args_length1, &args, _tmp11_, _tmp14_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14_ = (g_free (_tmp14_), NULL);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2463 "main.c"
-			goto __catch223_g_error;
+#line 2426 "main.c"
+			goto __catch224_g_error;
 		}
 	}
-	goto __finally223;
-	__catch223_g_error:
+	goto __finally224;
+	__catch224_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -2483,94 +2446,94 @@ void _vala_main (gchar** args, int args_length1) {
 		gchar** _tmp20_ = NULL;
 		gint _tmp20__length1 = 0;
 		const gchar* _tmp21_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		e = _inner_error_;
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
-		_inner_error_ = NULL;
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
+		_inner_error_ = NULL;
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp15_ = e;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp16_ = _tmp15_->message;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp17_ = g_strconcat (_tmp16_, "\n", NULL);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp18_ = _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		g_print ("%s", _tmp18_);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp18_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp19_ = _ ("Run “%s --help” to see a full list of available command line options.\n");
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp20_ = args;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp20__length1 = args_length1;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp21_ = _tmp20_[0];
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		g_print (_tmp19_, _tmp21_);
-#line 343 "/home/jens/Source/shotwell/src/main.vala"
+#line 347 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 344 "/home/jens/Source/shotwell/src/main.vala"
+#line 348 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (e);
-#line 344 "/home/jens/Source/shotwell/src/main.vala"
+#line 348 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2511 "main.c"
+#line 2474 "main.c"
 	}
-	__finally223:
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+	__finally224:
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		g_critical ("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 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2522 "main.c"
+#line 2485 "main.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/main.vala"
+#line 351 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22_ = commandline_options_show_version;
-#line 347 "/home/jens/Source/shotwell/src/main.vala"
+#line 351 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp22_) {
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 352 "/home/jens/Source/shotwell/src/main.vala"
 		if (RESOURCES_GIT_VERSION != NULL) {
-#line 349 "/home/jens/Source/shotwell/src/main.vala"
+#line 353 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2532 "main.c"
+#line 2495 "main.c"
 		} else {
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2536 "main.c"
+#line 2499 "main.c"
 		}
-#line 353 "/home/jens/Source/shotwell/src/main.vala"
+#line 357 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 355 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2542 "main.c"
+#line 2505 "main.c"
 	}
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp23_ = g_new0 (gchar*, 0 + 1);
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = _tmp23_;
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	mounts_length1 = 0;
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	_mounts_size_ = mounts_length1;
-#line 366 "/home/jens/Source/shotwell/src/main.vala"
+#line 370 "/home/jens/Source/shotwell/src/main.vala"
 	filename = NULL;
-#line 2554 "main.c"
+#line 2517 "main.c"
 	{
 		gint ctr = 0;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 		ctr = 1;
-#line 2559 "main.c"
+#line 2522 "main.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp24_ = TRUE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 			while (TRUE) {
-#line 2566 "main.c"
+#line 2529 "main.c"
 				gint _tmp26_ = 0;
 				gchar** _tmp27_ = NULL;
 				gint _tmp27__length1 = 0;
@@ -2582,281 +2545,281 @@ void _vala_main (gchar** args, int args_length1) {
 				gchar* _tmp31_ = NULL;
 				const gchar* _tmp32_ = NULL;
 				gboolean _tmp33_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				if (!_tmp24_) {
-#line 2580 "main.c"
+#line 2543 "main.c"
 					gint _tmp25_ = 0;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp25_ = ctr;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					ctr = _tmp25_ + 1;
-#line 2586 "main.c"
+#line 2549 "main.c"
 				}
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp24_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp26_ = ctr;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp27_ = args;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp27__length1 = args_length1;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				if (!(_tmp26_ < _tmp27__length1)) {
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					break;
-#line 2600 "main.c"
+#line 2563 "main.c"
 				}
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp28_ = args;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp28__length1 = args_length1;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp29_ = ctr;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp30_ = _tmp28_[_tmp29_];
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp31_ = g_strdup (_tmp30_);
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				arg = _tmp31_;
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp32_ = arg;
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp33_ = library_window_is_mount_uri_supported (_tmp32_);
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				if (_tmp33_) {
-#line 2620 "main.c"
+#line 2583 "main.c"
 					gchar** _tmp34_ = NULL;
 					gint _tmp34__length1 = 0;
 					const gchar* _tmp35_ = NULL;
 					gchar* _tmp36_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp34_ = mounts;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp34__length1 = mounts_length1;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp35_ = arg;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp36_ = g_strdup (_tmp35_);
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
-#line 2635 "main.c"
+#line 2598 "main.c"
 				} else {
 					gboolean _tmp37_ = FALSE;
 					const gchar* _tmp38_ = NULL;
 					gboolean _tmp39_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp38_ = filename;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp39_ = is_string_empty (_tmp38_);
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp39_) {
-#line 2646 "main.c"
+#line 2609 "main.c"
 						const gchar* _tmp40_ = NULL;
 						gboolean _tmp41_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp40_ = arg;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp41_ = string_contains (_tmp40_, "://");
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp37_ = !_tmp41_;
-#line 2655 "main.c"
+#line 2618 "main.c"
 					} else {
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp37_ = FALSE;
-#line 2659 "main.c"
+#line 2622 "main.c"
 					}
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp37_) {
-#line 2663 "main.c"
+#line 2626 "main.c"
 						const gchar* _tmp42_ = NULL;
 						gchar* _tmp43_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp42_ = arg;
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp43_ = g_strdup (_tmp42_);
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_g_free0 (filename);
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						filename = _tmp43_;
-#line 2674 "main.c"
+#line 2637 "main.c"
 					}
 				}
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (arg);
-#line 2679 "main.c"
+#line 2642 "main.c"
 			}
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp45_ = filename;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp46_ = is_string_empty (_tmp45_);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp46_) {
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp44_ = DEBUG_LIBRARY_PREFIX;
-#line 2691 "main.c"
+#line 2654 "main.c"
 	} else {
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp44_ = DEBUG_VIEWER_PREFIX;
-#line 2695 "main.c"
+#line 2658 "main.c"
 	}
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	debug_init (_tmp44_);
-#line 380 "/home/jens/Source/shotwell/src/main.vala"
+#line 384 "/home/jens/Source/shotwell/src/main.vala"
 	if (RESOURCES_GIT_VERSION != NULL) {
-#line 2701 "main.c"
+#line 2664 "main.c"
 		const gchar* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp48_ = filename;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp49_ = is_string_empty (_tmp48_);
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp49_) {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp47_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2713 "main.c"
+#line 2676 "main.c"
 		} else {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp47_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2717 "main.c"
+#line 2680 "main.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:381: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2721 "main.c"
+#line 385 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2684 "main.c"
 	} else {
 		const gchar* _tmp50_ = NULL;
 		const gchar* _tmp51_ = NULL;
 		gboolean _tmp52_ = FALSE;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp51_ = filename;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp52_ = is_string_empty (_tmp51_);
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp52_) {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp50_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2734 "main.c"
+#line 2697 "main.c"
 		} else {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp50_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2738 "main.c"
+#line 2701 "main.c"
 		}
-#line 385 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:385: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
-#line 2742 "main.c"
-	}
 #line 389 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:389: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
+#line 2705 "main.c"
+	}
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp53_ = g_date_time_new_now_local ();
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp54_ = _tmp53_;
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_);
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:389: Shotwell is running in timezone %s", _tmp55_);
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp55_);
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_g_date_time_unref0 (_tmp54_);
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp56_ = filename;
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp57_ = is_string_empty (_tmp56_);
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	application_init (!_tmp57_);
-#line 397 "/home/jens/Source/shotwell/src/main.vala"
+#line 401 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp58_ = commandline_options_data_dir;
-#line 397 "/home/jens/Source/shotwell/src/main.vala"
+#line 401 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp58_ != NULL) {
-#line 2764 "main.c"
+#line 2727 "main.c"
 		const gchar* _tmp59_ = NULL;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 402 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp59_ = commandline_options_data_dir;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 402 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_set_data_dir (_tmp59_);
-#line 2770 "main.c"
+#line 2733 "main.c"
 	} else {
-#line 400 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_try_migrate_data ();
-#line 2774 "main.c"
+#line 2737 "main.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_data_dir ();
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
+#line 408 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_cache_dir ();
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp60_ = args;
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp60__length1 = args_length1;
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp61_ = g_timer_new ();
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	_g_timer_destroy0 (startup_timer);
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	startup_timer = _tmp61_;
-#line 410 "/home/jens/Source/shotwell/src/main.vala"
+#line 414 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp62_ = startup_timer;
-#line 410 "/home/jens/Source/shotwell/src/main.vala"
+#line 414 "/home/jens/Source/shotwell/src/main.vala"
 	g_timer_start (_tmp62_);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
-	g_set_application_name (RESOURCES_APP_TITLE);
 #line 417 "/home/jens/Source/shotwell/src/main.vala"
+	g_set_application_name (RESOURCES_APP_TITLE);
+#line 421 "/home/jens/Source/shotwell/src/main.vala"
 	resources_init ();
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp63_ = filename;
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp64_ = is_string_empty (_tmp63_);
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp64_) {
-#line 2806 "main.c"
+#line 2769 "main.c"
 		gchar** _tmp65_ = NULL;
 		gint _tmp65__length1 = 0;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp65_ = mounts;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp65__length1 = mounts_length1;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		library_exec (_tmp65_, _tmp65__length1);
-#line 2815 "main.c"
+#line 2778 "main.c"
 	} else {
 		const gchar* _tmp66_ = NULL;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
+#line 429 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp66_ = filename;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
+#line 429 "/home/jens/Source/shotwell/src/main.vala"
 		editing_exec (_tmp66_);
-#line 2822 "main.c"
+#line 2785 "main.c"
 	}
-#line 428 "/home/jens/Source/shotwell/src/main.vala"
+#line 432 "/home/jens/Source/shotwell/src/main.vala"
 	resources_terminate ();
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
+#line 433 "/home/jens/Source/shotwell/src/main.vala"
 	application_terminate ();
-#line 430 "/home/jens/Source/shotwell/src/main.vala"
+#line 434 "/home/jens/Source/shotwell/src/main.vala"
 	debug_terminate ();
-#line 431 "/home/jens/Source/shotwell/src/main.vala"
+#line 435 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_terminate ();
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp68_ = filename;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp69_ = is_string_empty (_tmp68_);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp69_) {
-#line 2838 "main.c"
+#line 2801 "main.c"
 		gboolean _tmp70_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp70_ = was_already_running;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp67_ = !_tmp70_;
-#line 2844 "main.c"
+#line 2807 "main.c"
 	} else {
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp67_ = FALSE;
-#line 2848 "main.c"
+#line 2811 "main.c"
 	}
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp67_) {
-#line 2852 "main.c"
+#line 2815 "main.c"
 		gchar* orig_path = NULL;
 		GFile* _tmp71_ = NULL;
 		GFile* _tmp72_ = NULL;
@@ -2867,31 +2830,31 @@ void _vala_main (gchar** args, int args_length1) {
 		gchar* backup_path = NULL;
 		const gchar* _tmp77_ = NULL;
 		gchar* _tmp78_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp71_ = app_dirs_get_data_subdir ("data", NULL);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp72_ = _tmp71_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp73_ = g_file_get_child (_tmp72_, "photo.db");
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp74_ = _tmp73_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp75_ = g_file_get_path (_tmp74_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp76_ = _tmp75_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp74_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp72_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		orig_path = _tmp76_;
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp77_ = orig_path;
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp78_ = g_strconcat (_tmp77_, ".bak", NULL);
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		backup_path = _tmp78_;
-#line 2887 "main.c"
+#line 2850 "main.c"
 		{
 			GFile* src = NULL;
 			const gchar* _tmp79_ = NULL;
@@ -2901,91 +2864,91 @@ void _vala_main (gchar** args, int args_length1) {
 			GFile* _tmp82_ = NULL;
 			GFile* _tmp83_ = NULL;
 			GFile* _tmp84_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp79_ = orig_path;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			src = _tmp80_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp81_ = backup_path;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp82_ = g_file_new_for_commandline_arg (_tmp81_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			dest = _tmp82_;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp83_ = src;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp84_ = dest;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			g_file_copy (_tmp83_, _tmp84_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (dest);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
-#line 2921 "main.c"
-				goto __catch224_g_error;
+#line 2884 "main.c"
+				goto __catch225_g_error;
 			}
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (src);
-#line 2928 "main.c"
+#line 2891 "main.c"
 		}
-		goto __finally224;
-		__catch224_g_error:
+		goto __finally225;
+		__catch225_g_error:
 		{
 			GError* _error_ = NULL;
 			GError* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_error_ = _inner_error_;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp85_ = _error_;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp86_ = _tmp85_->message;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
-			g_warning ("main.vala:446: Failed to create backup file of database: %s", _tmp86_);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
+			g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp86_);
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_error_free0 (_error_);
-#line 2948 "main.c"
+#line 2911 "main.c"
 		}
-		__finally224:
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+		__finally225:
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (backup_path);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (orig_path);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (filename);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			g_critical ("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 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			g_clear_error (&_inner_error_);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			return;
-#line 2967 "main.c"
+#line 2930 "main.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/main.vala"
+#line 453 "/home/jens/Source/shotwell/src/main.vala"
 		sync ();
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (backup_path);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (orig_path);
-#line 2975 "main.c"
+#line 2938 "main.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (filename);
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2981 "main.c"
+#line 2944 "main.c"
 }
 
 
@@ -2996,11 +2959,11 @@ int main (int argc, char ** argv) {
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_main (argv, argc);
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	return 0;
-#line 2996 "main.c"
+#line 2959 "main.c"
 }
 
 
diff --git a/src/main.vala b/src/main.vala
index 6941734..0755f62 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -105,8 +105,7 @@ void library_exec(string[] mounts) {
             progress_dialog.update_display_every(100);
             progress_dialog.set_minimum_on_screen_time_msec(250);
             try {
-                string icon_path = AppDirs.get_resources_dir().get_child("icons").get_child("shotwell.svg").get_path();
-                progress_dialog.icon = new Gdk.Pixbuf.from_file(icon_path);
+                progress_dialog.icon = new Gdk.Pixbuf.from_resource("/org/gnome/Shotwell/icons/shotwell.svg");
             } catch (Error err) {
                 debug("Warning - could not load application icon for loading window: %s", err.message);
             }
@@ -323,6 +322,11 @@ void main(string[] args) {
     // parser is initialized in a thread-safe fashion; please see 
     // http://redmine.yorba.org/issues/4120 for details.
     GExiv2.initialize();
+    GExiv2.log_use_glib_logging();
+
+    // Set GExiv2 log level to DEBUG, filtering will be done through Shotwell
+    // logging mechanisms
+    GExiv2.log_set_level(GExiv2.LogLevel.DEBUG);
 
     // following the GIO programming guidelines at http://developer.gnome.org/gio/2.26/ch03.html,
     // set the GSETTINGS_SCHEMA_DIR environment variable to allow us to load GSettings schemas from 
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 2b56cbf..12ffba3 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -29,6 +29,8 @@
 
 #define GRAW_TYPE_INTERPOLATION_QUALITY (graw_interpolation_quality_get_type ())
 
+#define GRAW_TYPE_USE_CAMERA_MATRIX (graw_use_camera_matrix_get_type ())
+
 #define GRAW_TYPE_PROCESSED_IMAGE (graw_processed_image_get_type ())
 #define GRAW_PROCESSED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage))
 #define GRAW_PROCESSED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImageClass))
@@ -115,6 +117,12 @@ typedef enum  {
 	GRAW_INTERPOLATION_QUALITY_AHD = 3
 } GRawInterpolationQuality;
 
+typedef enum  {
+	GRAW_USE_CAMERA_MATRIX_IGNORE = 0,
+	GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE = 1,
+	GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA = 3
+} GRawUseCameraMatrix;
+
 struct _GRawProcessedImage {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -168,6 +176,7 @@ GType graw_flip_get_type (void) G_GNUC_CONST;
 GType graw_fuji_rotate_get_type (void) G_GNUC_CONST;
 GType graw_highlight_mode_get_type (void) G_GNUC_CONST;
 GType graw_interpolation_quality_get_type (void) G_GNUC_CONST;
+GType graw_use_camera_matrix_get_type (void) G_GNUC_CONST;
 gpointer graw_processed_image_ref (gpointer instance);
 void graw_processed_image_unref (gpointer instance);
 GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -290,6 +299,18 @@ GType graw_interpolation_quality_get_type (void) {
 }
 
 
+GType graw_use_camera_matrix_get_type (void) {
+	static volatile gsize graw_use_camera_matrix_type_id__volatile = 0;
+	if (g_once_init_enter (&graw_use_camera_matrix_type_id__volatile)) {
+		static const GEnumValue values[] = {{GRAW_USE_CAMERA_MATRIX_IGNORE, "GRAW_USE_CAMERA_MATRIX_IGNORE", "ignore"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE", "embedded-color-profile"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA", "embedded-color-data"}, {0, NULL, NULL}};
+		GType graw_use_camera_matrix_type_id;
+		graw_use_camera_matrix_type_id = g_enum_register_static ("GRawUseCameraMatrix", values);
+		g_once_init_leave (&graw_use_camera_matrix_type_id__volatile, graw_use_camera_matrix_type_id);
+	}
+	return graw_use_camera_matrix_type_id__volatile;
+}
+
+
 GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) {
 	GRawProcessedImage* self = NULL;
 	enum LibRaw_errors _result_ = 0;
@@ -312,91 +333,91 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da
 	gushort _tmp15_ = 0U;
 	GdkPixbuf* _tmp16_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 113 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_result_ = LIBRAW_SUCCESS;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = proc;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_make_mem_image (_tmp0_, &_result_);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->image = _tmp1_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = _result_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ProcessedImage", _tmp2_, &_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 344 "GRaw.c"
+#line 365 "GRaw.c"
 		} else {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 352 "GRaw.c"
+#line 373 "GRaw.c"
 		}
 	}
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = self->priv->image;
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_vala_assert (_tmp3_ != NULL, "image != null");
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp4_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5_ = _tmp4_->data;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5__length1 = _tmp4_->data_size;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp6_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = _tmp6_->bits;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = _tmp8_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = _tmp10_->height;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp12_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp13_ = _tmp12_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp14_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp15_ = _tmp14_->colors;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp16_ = gdk_pixbuf_new_from_data (_tmp5_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, (gint) (_tmp13_ * _tmp15_), (GdkPixbufDestroyNotify) NULL, NULL);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_object_unref0 (self->priv->pixbuf);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->pixbuf = _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 393 "GRaw.c"
+#line 414 "GRaw.c"
 }
 
 
 GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error) {
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processed_image_construct (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 400 "GRaw.c"
+#line 421 "GRaw.c"
 }
 
 
@@ -424,50 +445,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 	gint _tmp31_ = 0;
 	gint _tmp32_ = 0;
 	GError * _inner_error_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 119 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_result_ = LIBRAW_SUCCESS;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = proc;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_make_mem_thumb (_tmp0_, &_result_);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->image = _tmp1_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = _result_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ProcessedImage.from_thumb", _tmp2_, &_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 456 "GRaw.c"
+#line 477 "GRaw.c"
 		} else {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 464 "GRaw.c"
+#line 485 "GRaw.c"
 		}
 	}
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = self->priv->image;
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_vala_assert (_tmp3_ != NULL, "image != null");
-#line 471 "GRaw.c"
+#line 492 "GRaw.c"
 	{
 		GBytes* bytes = NULL;
 		libraw_processed_image_t* _tmp4_ = NULL;
@@ -481,50 +502,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp4_ = self->priv->image;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp5_ = _tmp4_->data;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp5__length1 = _tmp4_->data_size;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp6_ = g_bytes_new_static (_tmp5_, _tmp5__length1);
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		bytes = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp8_ = bytes;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp9_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp8_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp10_ = _tmp9_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/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_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp12_ = _tmp11_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (_tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp7_ = _tmp12_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_bytes_unref0 (bytes);
-#line 513 "GRaw.c"
+#line 534 "GRaw.c"
 			goto __catch29_g_error;
 		}
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp13_ = _tmp7_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp7_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (self->priv->pixbuf);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		self->priv->pixbuf = _tmp13_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (_tmp7_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_bytes_unref0 (bytes);
-#line 528 "GRaw.c"
+#line 549 "GRaw.c"
 	}
 	goto __finally29;
 	__catch29_g_error:
@@ -533,95 +554,95 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		err = _inner_error_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp14_ = err;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp15_ = _tmp14_->message;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp16_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp15_);
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_inner_error_ = _tmp16_;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_error_free0 (err);
-#line 551 "GRaw.c"
+#line 572 "GRaw.c"
 		goto __finally29;
 	}
 	__finally29:
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 565 "GRaw.c"
+#line 586 "GRaw.c"
 		} else {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 573 "GRaw.c"
+#line 594 "GRaw.c"
 		}
 	}
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_ = self->priv->image;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp18_ = self->priv->pixbuf;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp19_ = gdk_pixbuf_get_width (_tmp18_);
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp20_ = _tmp19_;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_->width = (gushort) _tmp20_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_ = self->priv->image;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp22_ = self->priv->pixbuf;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp23_ = gdk_pixbuf_get_height (_tmp22_);
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp24_ = _tmp23_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_->height = (gushort) _tmp24_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_ = self->priv->image;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp26_ = self->priv->pixbuf;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp27_ = gdk_pixbuf_get_n_channels (_tmp26_);
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp28_ = _tmp27_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_->colors = (gushort) _tmp28_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_ = self->priv->image;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp30_ = self->priv->pixbuf;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp31_ = gdk_pixbuf_get_bits_per_sample (_tmp30_);
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp32_ = _tmp31_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_->bits = (gushort) _tmp32_;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 618 "GRaw.c"
+#line 639 "GRaw.c"
 }
 
 
 GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error) {
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processed_image_construct_from_thumb (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 625 "GRaw.c"
+#line 646 "GRaw.c"
 }
 
 
@@ -629,17 +650,17 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->pixbuf;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = gdk_pixbuf_copy (_tmp0_);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 643 "GRaw.c"
+#line 664 "GRaw.c"
 }
 
 
@@ -647,17 +668,17 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 71 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->width;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 661 "GRaw.c"
+#line 682 "GRaw.c"
 }
 
 
@@ -665,17 +686,17 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->height;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 679 "GRaw.c"
+#line 700 "GRaw.c"
 }
 
 
@@ -683,17 +704,17 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->colors;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 697 "GRaw.c"
+#line 718 "GRaw.c"
 }
 
 
@@ -701,17 +722,17 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->bits;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 715 "GRaw.c"
+#line 736 "GRaw.c"
 }
 
 
@@ -720,19 +741,19 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) {
 	libraw_processed_image_t* _tmp0_ = NULL;
 	guint8* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->data;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1__length1 = _tmp0_->data_size;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 736 "GRaw.c"
+#line 757 "GRaw.c"
 }
 
 
@@ -740,233 +761,233 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self) {
 	guint result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->data_size;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 754 "GRaw.c"
+#line 775 "GRaw.c"
 }
 
 
 static void graw_value_processed_image_init (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 761 "GRaw.c"
+#line 782 "GRaw.c"
 }
 
 
 static void graw_value_processed_image_free_value (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (value->data[0].v_pointer);
-#line 770 "GRaw.c"
+#line 791 "GRaw.c"
 	}
 }
 
 
 static void graw_value_processed_image_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (src_value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processed_image_ref (src_value->data[0].v_pointer);
-#line 780 "GRaw.c"
+#line 801 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 784 "GRaw.c"
+#line 805 "GRaw.c"
 	}
 }
 
 
 static gpointer graw_value_processed_image_peek_pointer (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 792 "GRaw.c"
+#line 813 "GRaw.c"
 }
 
 
 static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 799 "GRaw.c"
+#line 820 "GRaw.c"
 		GRawProcessedImage* object;
 		object = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 806 "GRaw.c"
+#line 827 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 810 "GRaw.c"
+#line 831 "GRaw.c"
 		}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processed_image_ref (object);
-#line 814 "GRaw.c"
+#line 835 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 818 "GRaw.c"
+#line 839 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 822 "GRaw.c"
+#line 843 "GRaw.c"
 }
 
 
 static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	GRawProcessedImage** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 833 "GRaw.c"
+#line 854 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 839 "GRaw.c"
+#line 860 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 843 "GRaw.c"
+#line 864 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processed_image_ref (value->data[0].v_pointer);
-#line 847 "GRaw.c"
+#line 868 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 851 "GRaw.c"
+#line 872 "GRaw.c"
 }
 
 
 GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	GRawParamSpecProcessedImage* spec;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 865 "GRaw.c"
+#line 886 "GRaw.c"
 }
 
 
 gpointer graw_value_get_processed_image (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 874 "GRaw.c"
+#line 895 "GRaw.c"
 }
 
 
 void graw_value_set_processed_image (GValue* value, gpointer v_object) {
 	GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_ref (value->data[0].v_pointer);
-#line 894 "GRaw.c"
+#line 915 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 898 "GRaw.c"
+#line 919 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (old);
-#line 904 "GRaw.c"
+#line 925 "GRaw.c"
 	}
 }
 
 
 void graw_value_take_processed_image (GValue* value, gpointer v_object) {
 	GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 923 "GRaw.c"
+#line 944 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 927 "GRaw.c"
+#line 948 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (old);
-#line 933 "GRaw.c"
+#line 954 "GRaw.c"
 	}
 }
 
 
 static void graw_processed_image_class_init (GRawProcessedImageClass * klass) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_processed_image_parent_class = g_type_class_peek_parent (klass);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	((GRawProcessedImageClass *) klass)->finalize = graw_processed_image_finalize;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessedImagePrivate));
-#line 945 "GRaw.c"
+#line 966 "GRaw.c"
 }
 
 
 static void graw_processed_image_instance_init (GRawProcessedImage * self) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv = GRAW_PROCESSED_IMAGE_GET_PRIVATE (self);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->pixbuf = NULL;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 956 "GRaw.c"
+#line 977 "GRaw.c"
 }
 
 
 static void graw_processed_image_finalize (GRawProcessedImage* obj) {
 	GRawProcessedImage * self;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_signal_handlers_destroy (self);
-#line 67 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 73 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_object_unref0 (self->priv->pixbuf);
-#line 970 "GRaw.c"
+#line 991 "GRaw.c"
 }
 
 
@@ -987,24 +1008,24 @@ GType graw_processed_image_get_type (void) {
 gpointer graw_processed_image_ref (gpointer instance) {
 	GRawProcessedImage* self;
 	self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 995 "GRaw.c"
+#line 1016 "GRaw.c"
 }
 
 
 void graw_processed_image_unref (gpointer instance) {
 	GRawProcessedImage* self;
 	self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		GRAW_PROCESSED_IMAGE_GET_CLASS (self)->finalize (self);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1008 "GRaw.c"
+#line 1029 "GRaw.c"
 	}
 }
 
@@ -1013,26 +1034,26 @@ GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_construc
 	GRawProcessor* self = NULL;
 	enum LibRaw_constructor_flags _tmp0_ = 0;
 	libraw_data_t* _tmp1_ = NULL;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessor*) g_type_create_instance (object_type);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = options;
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_init (_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->proc = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 1029 "GRaw.c"
+#line 1050 "GRaw.c"
 }
 
 
 GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) {
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
-#line 1036 "GRaw.c"
+#line 1057 "GRaw.c"
 }
 
 
@@ -1040,31 +1061,31 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error)
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_adjust_sizes_info_only (_tmp0_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("adjust_sizes_info_only", _tmp1_, &_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1060 "GRaw.c"
+#line 1081 "GRaw.c"
 		} else {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1068 "GRaw.c"
+#line 1089 "GRaw.c"
 		}
 	}
 }
@@ -1081,7 +1102,7 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 	result = _tmp0_;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1085 "GRaw.c"
+#line 1106 "GRaw.c"
 }
 
 
@@ -1089,17 +1110,17 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	libraw_imgother_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_imgother_t _tmp1_ = {0};
-#line 165 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_image_other (_tmp0_);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1103 "GRaw.c"
+#line 1124 "GRaw.c"
 }
 
 
@@ -1114,7 +1135,7 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1118 "GRaw.c"
+#line 1139 "GRaw.c"
 }
 
 
@@ -1122,17 +1143,17 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	libraw_iparams_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_iparams_t _tmp1_ = {0};
-#line 169 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_image_params (_tmp0_);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1136 "GRaw.c"
+#line 1157 "GRaw.c"
 }
 
 
@@ -1147,7 +1168,7 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 	result = _tmp0_;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1151 "GRaw.c"
+#line 1172 "GRaw.c"
 }
 
 
@@ -1155,17 +1176,17 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	libraw_image_sizes_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_image_sizes_t _tmp1_ = {0};
-#line 173 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_sizes (_tmp0_);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1169 "GRaw.c"
+#line 1190 "GRaw.c"
 }
 
 
@@ -1180,7 +1201,7 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 	result = _tmp0_;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1184 "GRaw.c"
+#line 1205 "GRaw.c"
 }
 
 
@@ -1188,17 +1209,17 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_thumbnail_t _tmp1_ = {0};
-#line 177 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_thumbnail (_tmp0_);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1202 "GRaw.c"
+#line 1223 "GRaw.c"
 }
 
 
@@ -1209,44 +1230,44 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 	GRawProcessedImage* _tmp2_ = NULL;
 	GRawProcessedImage* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = self->priv->proc;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processed_image_new (_tmp1_, &_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _tmp2_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1229 "GRaw.c"
+#line 1250 "GRaw.c"
 		} else {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1237 "GRaw.c"
+#line 1258 "GRaw.c"
 		}
 	}
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp0_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp3_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_graw_processed_image_unref0 (_tmp0_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1250 "GRaw.c"
+#line 1271 "GRaw.c"
 }
 
 
@@ -1257,44 +1278,44 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 	GRawProcessedImage* _tmp2_ = NULL;
 	GRawProcessedImage* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = self->priv->proc;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processed_image_new_from_thumb (_tmp1_, &_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1277 "GRaw.c"
+#line 1298 "GRaw.c"
 		} else {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1285 "GRaw.c"
+#line 1306 "GRaw.c"
 		}
 	}
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp0_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp3_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_graw_processed_image_unref0 (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1298 "GRaw.c"
+#line 1319 "GRaw.c"
 }
 
 
@@ -1304,35 +1325,35 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 	gint _tmp1__length1 = 0;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 189 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = buffer;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1__length1 = buffer_length1;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_open_buffer (_tmp0_, _tmp1_, _tmp1__length1);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("open_buffer", _tmp2_, &_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1328 "GRaw.c"
+#line 1349 "GRaw.c"
 		} else {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1336 "GRaw.c"
+#line 1357 "GRaw.c"
 		}
 	}
 }
@@ -1343,35 +1364,35 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_open_file (_tmp0_, _tmp1_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("open_file", _tmp2_, &_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1367 "GRaw.c"
+#line 1388 "GRaw.c"
 		} else {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1375 "GRaw.c"
+#line 1396 "GRaw.c"
 		}
 	}
 }
@@ -1381,31 +1402,31 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 197 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_process (_tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("process", _tmp1_, &_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1401 "GRaw.c"
+#line 1422 "GRaw.c"
 		} else {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1409 "GRaw.c"
+#line 1430 "GRaw.c"
 		}
 	}
 }
@@ -1416,35 +1437,35 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_dcraw_ppm_tiff_writer (_tmp0_, _tmp1_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ppm_tiff_writer", _tmp2_, &_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1440 "GRaw.c"
+#line 1461 "GRaw.c"
 		} else {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1448 "GRaw.c"
+#line 1469 "GRaw.c"
 		}
 	}
 }
@@ -1455,35 +1476,35 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_dcraw_thumb_writer (_tmp0_, _tmp1_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("thumb_writer", _tmp2_, &_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1479 "GRaw.c"
+#line 1500 "GRaw.c"
 		} else {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1487 "GRaw.c"
+#line 1508 "GRaw.c"
 		}
 	}
 }
@@ -1491,13 +1512,13 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 
 void graw_processor_recycle (GRawProcessor* self) {
 	libraw_data_t* _tmp0_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	libraw_recycle (_tmp0_);
-#line 1501 "GRaw.c"
+#line 1522 "GRaw.c"
 }
 
 
@@ -1505,31 +1526,31 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_unpack (_tmp0_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("unpack", _tmp1_, &_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1525 "GRaw.c"
+#line 1546 "GRaw.c"
 		} else {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1533 "GRaw.c"
+#line 1554 "GRaw.c"
 		}
 	}
 }
@@ -1539,75 +1560,87 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_unpack_thumb (_tmp0_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("unpack_thumb", _tmp1_, &_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1559 "GRaw.c"
+#line 1580 "GRaw.c"
 		} else {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1567 "GRaw.c"
+#line 1588 "GRaw.c"
 		}
 	}
 }
 
 
-static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t self, gdouble red_multiplier, gdouble green_multiplier) {
-	gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) {
+	libraw_output_params_t* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	libraw_output_params_t* _tmp3_ = NULL;
+	gdouble _tmp4_ = 0.0;
+	gdouble _tmp5_ = 0.0;
+#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp0_ = params;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp0_ = red_multiplier;
+	_tmp1_ = red_multiplier;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.aber[0] = _tmp0_;
+	(*_tmp0_).aber[0] = _tmp1_;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp1_ = self.aber[0];
+	_tmp2_ = (*_tmp0_).aber[0];
+#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp3_ = params;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp2_ = green_multiplier;
+	_tmp4_ = green_multiplier;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.aber[2] = _tmp2_;
+	(*_tmp3_).aber[2] = _tmp4_;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp3_ = self.aber[2];
-#line 1590 "GRaw.c"
+	_tmp5_ = (*_tmp3_).aber[2];
+#line 1617 "GRaw.c"
 }
 
 
-static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t self, gdouble power, gdouble slope) {
-	gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) {
+	libraw_output_params_t* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	libraw_output_params_t* _tmp3_ = NULL;
+	gdouble _tmp4_ = 0.0;
+	gdouble _tmp5_ = 0.0;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp0_ = power;
+	_tmp0_ = params;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.gamm[0] = _tmp0_;
+	_tmp1_ = power;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp1_ = self.gamm[0];
+	(*_tmp0_).gamm[0] = 1.0 / _tmp1_;
+#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp2_ = (*_tmp0_).gamm[0];
+#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp3_ = params;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp2_ = slope;
+	_tmp4_ = slope;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.gamm[1] = _tmp2_;
+	(*_tmp3_).gamm[1] = _tmp4_;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp3_ = self.gamm[1];
-#line 1611 "GRaw.c"
+	_tmp5_ = (*_tmp3_).gamm[1];
+#line 1644 "GRaw.c"
 }
 
 
@@ -1643,328 +1676,328 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
 	libraw_output_params_t* _tmp28_ = NULL;
 	libraw_output_params_t* _tmp29_ = NULL;
 	libraw_output_params_t* _tmp30_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = graw_processor_get_output_params (self);
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_;
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	lib_raw_output_params_set_chromatic_aberrations (*_tmp1_, 1.0, 1.0);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	lib_raw_output_params_set_chromatic_aberrations (_tmp1_, 1.0, 1.0);
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processor_get_output_params (self);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp2_;
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	lib_raw_output_params_set_gamma_curve (*_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	lib_raw_output_params_set_gamma_curve (_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp4_ = graw_processor_get_output_params (self);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5_ = _tmp4_;
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp5_).bright = 1.0f;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp6_ = graw_processor_get_output_params (self);
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = _tmp6_;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = half_size;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp7_).half_size = _tmp8_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = graw_processor_get_output_params (self);
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = _tmp9_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp10_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = graw_processor_get_output_params (self);
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp12_ = _tmp11_;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp12_).use_auto_wb = TRUE;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp13_ = graw_processor_get_output_params (self);
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp14_ = _tmp13_;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp14_).use_camera_wb = TRUE;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp15_ = graw_processor_get_output_params (self);
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp16_ = _tmp15_;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	(*_tmp16_).use_camera_matrix = TRUE;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	(*_tmp16_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE;
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_ = graw_processor_get_output_params (self);
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp18_ = _tmp17_;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp18_).output_color = (gint) GRAW_COLORSPACE_SRGB;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp19_ = graw_processor_get_output_params (self);
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp20_ = _tmp19_;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp20_).output_bps = 8;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_ = graw_processor_get_output_params (self);
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp22_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp22_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp23_ = graw_processor_get_output_params (self);
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp24_ = _tmp23_;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp24_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_ = graw_processor_get_output_params (self);
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp26_ = _tmp25_;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp26_).no_auto_bright = TRUE;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp27_ = graw_processor_get_output_params (self);
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp28_ = _tmp27_;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp28_).auto_bright_thr = 0.01f;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_ = graw_processor_get_output_params (self);
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp30_ = _tmp29_;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1741 "GRaw.c"
+#line 1774 "GRaw.c"
 }
 
 
 libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
 	libraw_output_params_t* result;
 	libraw_data_t* _tmp0_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = &_tmp0_->params;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1756 "GRaw.c"
+#line 1789 "GRaw.c"
 }
 
 
 static void graw_value_processor_init (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 1763 "GRaw.c"
+#line 1796 "GRaw.c"
 }
 
 
 static void graw_value_processor_free_value (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (value->data[0].v_pointer);
-#line 1772 "GRaw.c"
+#line 1805 "GRaw.c"
 	}
 }
 
 
 static void graw_value_processor_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (src_value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1782 "GRaw.c"
+#line 1815 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1786 "GRaw.c"
+#line 1819 "GRaw.c"
 	}
 }
 
 
 static gpointer graw_value_processor_peek_pointer (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1794 "GRaw.c"
+#line 1827 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 1801 "GRaw.c"
+#line 1834 "GRaw.c"
 		GRawProcessor* object;
 		object = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1808 "GRaw.c"
+#line 1841 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1812 "GRaw.c"
+#line 1845 "GRaw.c"
 		}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processor_ref (object);
-#line 1816 "GRaw.c"
+#line 1849 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1820 "GRaw.c"
+#line 1853 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1824 "GRaw.c"
+#line 1857 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	GRawProcessor** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1835 "GRaw.c"
+#line 1868 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 1841 "GRaw.c"
+#line 1874 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1845 "GRaw.c"
+#line 1878 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1849 "GRaw.c"
+#line 1882 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1853 "GRaw.c"
+#line 1886 "GRaw.c"
 }
 
 
 GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	GRawParamSpecProcessor* spec;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 1867 "GRaw.c"
+#line 1900 "GRaw.c"
 }
 
 
 gpointer graw_value_get_processor (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1876 "GRaw.c"
+#line 1909 "GRaw.c"
 }
 
 
 void graw_value_set_processor (GValue* value, gpointer v_object) {
 	GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_ref (value->data[0].v_pointer);
-#line 1896 "GRaw.c"
+#line 1929 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1900 "GRaw.c"
+#line 1933 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1906 "GRaw.c"
+#line 1939 "GRaw.c"
 	}
 }
 
 
 void graw_value_take_processor (GValue* value, gpointer v_object) {
 	GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 1925 "GRaw.c"
+#line 1958 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1929 "GRaw.c"
+#line 1962 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1935 "GRaw.c"
+#line 1968 "GRaw.c"
 	}
 }
 
 
 static void graw_processor_class_init (GRawProcessorClass * klass) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_processor_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1947 "GRaw.c"
+#line 1980 "GRaw.c"
 }
 
 
 static void graw_processor_instance_init (GRawProcessor * self) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 1956 "GRaw.c"
+#line 1989 "GRaw.c"
 }
 
 
 static void graw_processor_finalize (GRawProcessor* obj) {
 	GRawProcessor * self;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_signal_handlers_destroy (self);
-#line 155 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 1968 "GRaw.c"
+#line 2001 "GRaw.c"
 }
 
 
@@ -1985,24 +2018,24 @@ GType graw_processor_get_type (void) {
 gpointer graw_processor_ref (gpointer instance) {
 	GRawProcessor* self;
 	self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 1993 "GRaw.c"
+#line 2026 "GRaw.c"
 }
 
 
 void graw_processor_unref (gpointer instance) {
 	GRawProcessor* self;
 	self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2006 "GRaw.c"
+#line 2039 "GRaw.c"
 	}
 }
 
@@ -2016,149 +2049,83 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	gchar* _tmp10_ = NULL;
 	enum LibRaw_errors _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (caller != NULL);
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _result_;
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (_tmp0_ == LIBRAW_SUCCESS) {
-#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return;
-#line 2028 "GRaw.c"
+#line 2061 "GRaw.c"
 	} else {
 		enum LibRaw_errors _tmp1_ = 0;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp1_ = _result_;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_tmp1_ > 0) {
-#line 2035 "GRaw.c"
+#line 2068 "GRaw.c"
 			const gchar* _tmp2_ = NULL;
 			enum LibRaw_errors _tmp3_ = 0;
 			enum LibRaw_errors _tmp4_ = 0;
 			const gchar* _tmp5_ = NULL;
 			GError* _tmp6_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp2_ = caller;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp3_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp4_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp5_ = g_strerror ((gint) _tmp4_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp6_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", _tmp2_, (gint) _tmp3_, _tmp5_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_inner_error_ = _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2059 "GRaw.c"
+#line 2092 "GRaw.c"
 			} else {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_clear_error (&_inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2067 "GRaw.c"
+#line 2100 "GRaw.c"
 			}
 		}
 	}
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = caller;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = _result_;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = libraw_strerror (_tmp8_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = g_strdup_printf ("%s: %s", _tmp7_, _tmp9_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	msg = _tmp10_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = _result_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	switch (_tmp11_) {
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSPECIFIED_ERROR:
-#line 2087 "GRaw.c"
+#line 2120 "GRaw.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp12_ = msg;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp13_;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2105 "GRaw.c"
-			} else {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_clear_error (&_inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2115 "GRaw.c"
-			}
-		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_FILE_UNSUPPORTED:
-#line 2120 "GRaw.c"
-		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp14_ = msg;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp15_;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2138 "GRaw.c"
-			} else {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_clear_error (&_inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2148 "GRaw.c"
-			}
-		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2153 "GRaw.c"
-		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp16_ = msg;
+			_tmp12_ = msg;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
+			_tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp17_;
+			_inner_error_ = _tmp13_;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2167,7 +2134,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2171 "GRaw.c"
+#line 2138 "GRaw.c"
 			} else {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2177,21 +2144,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2181 "GRaw.c"
+#line 2148 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2186 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_FILE_UNSUPPORTED:
+#line 2153 "GRaw.c"
 		{
-			const gchar* _tmp18_ = NULL;
-			GError* _tmp19_ = NULL;
+			const gchar* _tmp14_ = NULL;
+			GError* _tmp15_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp18_ = msg;
+			_tmp14_ = msg;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
+			_tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp19_;
+			_inner_error_ = _tmp15_;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2200,7 +2167,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2204 "GRaw.c"
+#line 2171 "GRaw.c"
 			} else {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2210,21 +2177,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2214 "GRaw.c"
+#line 2181 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_NO_THUMBNAIL:
-#line 2219 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
+#line 2186 "GRaw.c"
 		{
-			const gchar* _tmp20_ = NULL;
-			GError* _tmp21_ = NULL;
+			const gchar* _tmp16_ = NULL;
+			GError* _tmp17_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp20_ = msg;
+			_tmp16_ = msg;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
+			_tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp21_;
+			_inner_error_ = _tmp17_;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2233,7 +2200,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2237 "GRaw.c"
+#line 2204 "GRaw.c"
 			} else {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2243,21 +2210,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2247 "GRaw.c"
+#line 2214 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_OUT_OF_ORDER_CALL:
+#line 2219 "GRaw.c"
 		{
-			const gchar* _tmp22_ = NULL;
-			GError* _tmp23_ = NULL;
+			const gchar* _tmp18_ = NULL;
+			GError* _tmp19_ = NULL;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp22_ = msg;
+			_tmp18_ = msg;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
+			_tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp23_;
+			_inner_error_ = _tmp19_;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2266,7 +2233,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2270 "GRaw.c"
+#line 2237 "GRaw.c"
 			} else {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2276,21 +2243,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2280 "GRaw.c"
+#line 2247 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2285 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_NO_THUMBNAIL:
+#line 2252 "GRaw.c"
 		{
-			const gchar* _tmp24_ = NULL;
-			GError* _tmp25_ = NULL;
+			const gchar* _tmp20_ = NULL;
+			GError* _tmp21_ = NULL;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp24_ = msg;
+			_tmp20_ = msg;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
+			_tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp25_;
+			_inner_error_ = _tmp21_;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2299,7 +2266,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2303 "GRaw.c"
+#line 2270 "GRaw.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2309,21 +2276,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2313 "GRaw.c"
+#line 2280 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_DATA_ERROR:
-#line 2318 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_UNSUPPORTED_THUMBNAIL:
+#line 2285 "GRaw.c"
 		{
-			const gchar* _tmp26_ = NULL;
-			GError* _tmp27_ = NULL;
+			const gchar* _tmp22_ = NULL;
+			GError* _tmp23_ = NULL;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp26_ = msg;
+			_tmp22_ = msg;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
+			_tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp27_;
+			_inner_error_ = _tmp23_;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2332,7 +2299,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2336 "GRaw.c"
+#line 2303 "GRaw.c"
 			} else {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2342,21 +2309,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2346 "GRaw.c"
+#line 2313 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_IO_ERROR:
-#line 2351 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_UNSUFFICIENT_MEMORY:
+#line 2318 "GRaw.c"
 		{
-			const gchar* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			const gchar* _tmp24_ = NULL;
+			GError* _tmp25_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp28_ = msg;
+			_tmp24_ = msg;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
+			_tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp29_;
+			_inner_error_ = _tmp25_;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2365,7 +2332,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2369 "GRaw.c"
+#line 2336 "GRaw.c"
 			} else {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2375,21 +2342,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2379 "GRaw.c"
+#line 2346 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2384 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_DATA_ERROR:
+#line 2351 "GRaw.c"
 		{
-			const gchar* _tmp30_ = NULL;
-			GError* _tmp31_ = NULL;
+			const gchar* _tmp26_ = NULL;
+			GError* _tmp27_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp30_ = msg;
+			_tmp26_ = msg;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+			_tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp31_;
+			_inner_error_ = _tmp27_;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2398,7 +2365,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2402 "GRaw.c"
+#line 2369 "GRaw.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2408,21 +2375,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2412 "GRaw.c"
+#line 2379 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_BAD_CROP:
-#line 2417 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_IO_ERROR:
+#line 2384 "GRaw.c"
 		{
-			const gchar* _tmp32_ = NULL;
-			GError* _tmp33_ = NULL;
+			const gchar* _tmp28_ = NULL;
+			GError* _tmp29_ = NULL;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp32_ = msg;
+			_tmp28_ = msg;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+			_tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp33_;
+			_inner_error_ = _tmp29_;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2431,7 +2398,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2435 "GRaw.c"
+#line 2402 "GRaw.c"
 			} else {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2441,21 +2408,87 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
+#line 2412 "GRaw.c"
+			}
+		}
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_CANCELLED_BY_CALLBACK:
+#line 2417 "GRaw.c"
+		{
+			const gchar* _tmp30_ = NULL;
+			GError* _tmp31_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp30_ = msg;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_inner_error_ = _tmp31_;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_propagate_error (error, _inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2435 "GRaw.c"
+			} else {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_clear_error (&_inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
 #line 2445 "GRaw.c"
 			}
 		}
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_BAD_CROP:
+#line 2450 "GRaw.c"
+		{
+			const gchar* _tmp32_ = NULL;
+			GError* _tmp33_ = NULL;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp32_ = msg;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_inner_error_ = _tmp33_;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_propagate_error (error, _inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2468 "GRaw.c"
+			} else {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_clear_error (&_inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2478 "GRaw.c"
+			}
+		}
 		default:
 		{
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_free0 (msg);
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 2454 "GRaw.c"
+#line 2487 "GRaw.c"
 		}
 	}
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_free0 (msg);
-#line 2459 "GRaw.c"
+#line 2492 "GRaw.c"
 }
 
 
diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
index ec1df8d..19b5cdc 100644
--- a/src/photos/GRaw.vala
+++ b/src/photos/GRaw.vala
@@ -63,6 +63,12 @@ public enum InterpolationQuality {
     AHD = 3
 }
 
+public enum UseCameraMatrix {
+    IGNORE = 0,
+    EMBEDDED_COLOR_PROFILE = 1,
+    EMBEDDED_COLOR_DATA = 3
+}
+
 public class ProcessedImage {
     private LibRaw.ProcessedImage image;
     private Gdk.Pixbuf pixbuf = null;
@@ -226,8 +232,8 @@ public class Processor {
         // These fields are set to reasonable defaults by libraw.
         
         // greybox
-        output_params->set_chromatic_aberrations(1.0, 1.0);
-        output_params->set_gamma_curve(GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
+        LibRaw.OutputParams.set_chromatic_aberrations(output_params, 1.0, 1.0);
+        LibRaw.OutputParams.set_gamma_curve(output_params, GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
         // user_mul
         // shot_select
         // multi_out
@@ -238,7 +244,7 @@ public class Processor {
         output_params->highlight = GRaw.HighlightMode.CLIP;
         output_params->use_auto_wb = true;
         output_params->use_camera_wb = true;
-        output_params->use_camera_matrix = true;
+        output_params->use_camera_matrix = GRaw.UseCameraMatrix.EMBEDDED_COLOR_PROFILE;
         output_params->output_color = GRaw.Colorspace.SRGB;
         // output_profile
         // camera_profile
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 59a0632..89b0e25 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -79,6 +79,8 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
 
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define TYPE_PHOTO_FILE_WRITER (photo_file_writer_get_type ())
 #define PHOTO_FILE_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_WRITER, PhotoFileWriter))
 #define PHOTO_FILE_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_WRITER, PhotoFileWriterClass))
@@ -153,6 +155,15 @@ struct _PhotoFileReaderClass {
 };
 
 typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+struct _PhotoFileReaderPrivate {
+	PhotoFileReaderRole role;
+};
+
+typedef enum  {
 	PHOTO_FORMAT_ERROR_READ_ONLY
 } PhotoFormatError;
 #define PHOTO_FORMAT_ERROR photo_format_error_quark ()
@@ -219,6 +230,8 @@ GType photo_metadata_get_type (void) G_GNUC_CONST;
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+#define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate))
 enum  {
 	PHOTO_FILE_READER_DUMMY_PROPERTY
 };
@@ -237,6 +250,9 @@ static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, G
 GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
 static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+static void photo_file_reader_finalize (PhotoFileAdapter* obj);
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 enum  {
 	PHOTO_FILE_WRITER_DUMMY_PROPERTY
@@ -278,7 +294,7 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar*
 	self->priv->file_format = _tmp2_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 282 "PhotoFileAdapter.c"
+#line 298 "PhotoFileAdapter.c"
 }
 
 
@@ -296,7 +312,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
 	result = _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 300 "PhotoFileAdapter.c"
+#line 316 "PhotoFileAdapter.c"
 }
 
 
@@ -314,14 +330,14 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
 	result = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 318 "PhotoFileAdapter.c"
+#line 334 "PhotoFileAdapter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 325 "PhotoFileAdapter.c"
+#line 341 "PhotoFileAdapter.c"
 }
 
 
@@ -331,14 +347,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 	GError * _inner_error_ = NULL;
 #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
-#line 335 "PhotoFileAdapter.c"
+#line 351 "PhotoFileAdapter.c"
 	{
 		GFile* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		_tmp0_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_rec_mutex_lock (&self->priv->__lock_file);
-#line 342 "PhotoFileAdapter.c"
+#line 358 "PhotoFileAdapter.c"
 		{
 			GFile* _tmp1_ = NULL;
 			GFile* _tmp4_ = NULL;
@@ -347,7 +363,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp1_ = self->priv->file;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			if (_tmp1_ == NULL) {
-#line 351 "PhotoFileAdapter.c"
+#line 367 "PhotoFileAdapter.c"
 				const gchar* _tmp2_ = NULL;
 				GFile* _tmp3_ = NULL;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -358,7 +374,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 				_g_object_unref0 (self->priv->file);
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 				self->priv->file = _tmp3_;
-#line 362 "PhotoFileAdapter.c"
+#line 378 "PhotoFileAdapter.c"
 			}
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_tmp4_ = self->priv->file;
@@ -368,7 +384,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_g_object_unref0 (_result_);
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_result_ = _tmp5_;
-#line 372 "PhotoFileAdapter.c"
+#line 388 "PhotoFileAdapter.c"
 		}
 		__finally24:
 		{
@@ -377,7 +393,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp6_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_file);
-#line 381 "PhotoFileAdapter.c"
+#line 397 "PhotoFileAdapter.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -389,14 +405,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			g_clear_error (&_inner_error_);
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 393 "PhotoFileAdapter.c"
+#line 409 "PhotoFileAdapter.c"
 		}
 	}
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _result_;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 400 "PhotoFileAdapter.c"
+#line 416 "PhotoFileAdapter.c"
 }
 
 
@@ -411,14 +427,14 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 415 "PhotoFileAdapter.c"
+#line 431 "PhotoFileAdapter.c"
 }
 
 
 static void value_photo_file_adapter_init (GValue* value) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	value->data[0].v_pointer = NULL;
-#line 422 "PhotoFileAdapter.c"
+#line 438 "PhotoFileAdapter.c"
 }
 
 
@@ -427,7 +443,7 @@ static void value_photo_file_adapter_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (value->data[0].v_pointer);
-#line 431 "PhotoFileAdapter.c"
+#line 447 "PhotoFileAdapter.c"
 	}
 }
 
@@ -437,11 +453,11 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer);
-#line 441 "PhotoFileAdapter.c"
+#line 457 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 445 "PhotoFileAdapter.c"
+#line 461 "PhotoFileAdapter.c"
 	}
 }
 
@@ -449,37 +465,37 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
 static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 453 "PhotoFileAdapter.c"
+#line 469 "PhotoFileAdapter.c"
 }
 
 
 static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (collect_values[0].v_pointer) {
-#line 460 "PhotoFileAdapter.c"
+#line 476 "PhotoFileAdapter.c"
 		PhotoFileAdapter* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 467 "PhotoFileAdapter.c"
+#line 483 "PhotoFileAdapter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.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 471 "PhotoFileAdapter.c"
+#line 487 "PhotoFileAdapter.c"
 		}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = photo_file_adapter_ref (object);
-#line 475 "PhotoFileAdapter.c"
+#line 491 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 479 "PhotoFileAdapter.c"
+#line 495 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 483 "PhotoFileAdapter.c"
+#line 499 "PhotoFileAdapter.c"
 }
 
 
@@ -490,25 +506,25 @@ static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 494 "PhotoFileAdapter.c"
+#line 510 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = NULL;
-#line 500 "PhotoFileAdapter.c"
+#line 516 "PhotoFileAdapter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 504 "PhotoFileAdapter.c"
+#line 520 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = photo_file_adapter_ref (value->data[0].v_pointer);
-#line 508 "PhotoFileAdapter.c"
+#line 524 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 512 "PhotoFileAdapter.c"
+#line 528 "PhotoFileAdapter.c"
 }
 
 
@@ -522,7 +538,7 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return G_PARAM_SPEC (spec);
-#line 526 "PhotoFileAdapter.c"
+#line 542 "PhotoFileAdapter.c"
 }
 
 
@@ -531,7 +547,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 535 "PhotoFileAdapter.c"
+#line 551 "PhotoFileAdapter.c"
 }
 
 
@@ -551,17 +567,17 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_ref (value->data[0].v_pointer);
-#line 555 "PhotoFileAdapter.c"
+#line 571 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 559 "PhotoFileAdapter.c"
+#line 575 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 565 "PhotoFileAdapter.c"
+#line 581 "PhotoFileAdapter.c"
 	}
 }
 
@@ -580,17 +596,17 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = v_object;
-#line 584 "PhotoFileAdapter.c"
+#line 600 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 588 "PhotoFileAdapter.c"
+#line 604 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 594 "PhotoFileAdapter.c"
+#line 610 "PhotoFileAdapter.c"
 	}
 }
 
@@ -602,7 +618,7 @@ static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) {
 	((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate));
-#line 606 "PhotoFileAdapter.c"
+#line 622 "PhotoFileAdapter.c"
 }
 
 
@@ -615,7 +631,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
 	self->priv->file = NULL;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->ref_count = 1;
-#line 619 "PhotoFileAdapter.c"
+#line 635 "PhotoFileAdapter.c"
 }
 
 
@@ -631,7 +647,7 @@ static void photo_file_adapter_finalize (PhotoFileAdapter* obj) {
 	g_rec_mutex_clear (&self->priv->__lock_file);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_object_unref0 (self->priv->file);
-#line 635 "PhotoFileAdapter.c"
+#line 651 "PhotoFileAdapter.c"
 }
 
 
@@ -656,7 +672,7 @@ gpointer photo_file_adapter_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return instance;
-#line 660 "PhotoFileAdapter.c"
+#line 676 "PhotoFileAdapter.c"
 }
 
 
@@ -669,8 +685,20 @@ void photo_file_adapter_unref (gpointer instance) {
 		PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 673 "PhotoFileAdapter.c"
+#line 689 "PhotoFileAdapter.c"
+	}
+}
+
+
+GType photo_file_reader_role_get_type (void) {
+	static volatile gsize photo_file_reader_role_type_id__volatile = 0;
+	if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) {
+		static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}};
+		GType photo_file_reader_role_type_id;
+		photo_file_reader_role_type_id = g_enum_register_static ("PhotoFileReaderRole", values);
+		g_once_init_leave (&photo_file_reader_role_type_id__volatile, photo_file_reader_role_type_id);
 	}
+	return photo_file_reader_role_type_id__volatile;
 }
 
 
@@ -678,17 +706,17 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi
 	PhotoFileReader* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 692 "PhotoFileAdapter.c"
+#line 720 "PhotoFileAdapter.c"
 }
 
 
@@ -702,52 +730,52 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
 	PhotoFileWriter* _tmp5_ = NULL;
 	PhotoFileWriter* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = _tmp2_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp5_ = _tmp4_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp3_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp5_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_propagate_error (error, _inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 730 "PhotoFileAdapter.c"
+#line 758 "PhotoFileAdapter.c"
 		} else {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("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 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_clear_error (&_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 738 "PhotoFileAdapter.c"
+#line 766 "PhotoFileAdapter.c"
 		}
 	}
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp6_ = _tmp0_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp6_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 751 "PhotoFileAdapter.c"
+#line 779 "PhotoFileAdapter.c"
 }
 
 
@@ -761,88 +789,88 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
 	PhotoFileMetadataWriter* _tmp5_ = NULL;
 	PhotoFileMetadataWriter* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = _tmp2_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp5_ = _tmp4_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp3_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp5_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_propagate_error (error, _inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 789 "PhotoFileAdapter.c"
+#line 817 "PhotoFileAdapter.c"
 		} else {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("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 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_clear_error (&_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 797 "PhotoFileAdapter.c"
+#line 825 "PhotoFileAdapter.c"
 		}
 	}
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp6_ = _tmp0_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp6_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 810 "PhotoFileAdapter.c"
+#line 838 "PhotoFileAdapter.c"
 }
 
 
 static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 819 "PhotoFileAdapter.c"
+#line 847 "PhotoFileAdapter.c"
 }
 
 
 PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error);
-#line 828 "PhotoFileAdapter.c"
+#line 856 "PhotoFileAdapter.c"
 }
 
 
 static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 837 "PhotoFileAdapter.c"
+#line 865 "PhotoFileAdapter.c"
 }
 
 
 GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error);
-#line 846 "PhotoFileAdapter.c"
+#line 874 "PhotoFileAdapter.c"
 }
 
 
@@ -853,42 +881,69 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
 	Dimensions _tmp2_ = {0};
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (full != NULL, NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_reader_unscaled_read (self, &_inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_propagate_error (error, _inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return NULL;
-#line 871 "PhotoFileAdapter.c"
+#line 899 "PhotoFileAdapter.c"
 	}
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = *scaled;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = resize_pixbuf (_tmp0_, &_tmp2_, GDK_INTERP_BILINEAR);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_object_unref0 (_tmp0_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 883 "PhotoFileAdapter.c"
+#line 911 "PhotoFileAdapter.c"
 }
 
 
 GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error);
-#line 892 "PhotoFileAdapter.c"
+#line 920 "PhotoFileAdapter.c"
+}
+
+
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) {
+	PhotoFileReaderRole _tmp0_ = 0;
+#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_return_if_fail (IS_PHOTO_FILE_READER (self));
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	_tmp0_ = role;
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv->role = _tmp0_;
+#line 932 "PhotoFileAdapter.c"
+}
+
+
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
+	PhotoFileReaderRole result = 0;
+	PhotoFileReaderRole _tmp0_ = 0;
+#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0);
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	_tmp0_ = self->priv->role;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	result = _tmp0_;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	return result;
+#line 947 "PhotoFileAdapter.c"
 }
 
 
@@ -896,16 +951,35 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_reader_parent_class = g_type_class_peek_parent (klass);
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	((PhotoFileAdapterClass *) klass)->finalize = photo_file_reader_finalize;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate));
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->read_metadata = photo_file_reader_real_read_metadata;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->unscaled_read = photo_file_reader_real_unscaled_read;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = photo_file_reader_real_scaled_read;
-#line 905 "PhotoFileAdapter.c"
+#line 964 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_reader_instance_init (PhotoFileReader * self) {
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv = PHOTO_FILE_READER_GET_PRIVATE (self);
+#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT;
+#line 973 "PhotoFileAdapter.c"
+}
+
+
+static void photo_file_reader_finalize (PhotoFileAdapter* obj) {
+	PhotoFileReader * self;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader);
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj);
+#line 983 "PhotoFileAdapter.c"
 }
 
 
@@ -925,17 +999,17 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi
 	PhotoFileWriter* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 939 "PhotoFileAdapter.c"
+#line 1013 "PhotoFileAdapter.c"
 }
 
 
@@ -946,52 +1020,52 @@ PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) {
 	gchar* _tmp2_ = NULL;
 	PhotoFileReader* _tmp3_ = NULL;
 	PhotoFileReader* _tmp4_ = NULL;
-#line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = _tmp1_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = _tmp3_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp4_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 968 "PhotoFileAdapter.c"
+#line 1042 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 977 "PhotoFileAdapter.c"
+#line 1051 "PhotoFileAdapter.c"
 }
 
 
 void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_WRITER (self));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error);
-#line 986 "PhotoFileAdapter.c"
+#line 1060 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_writer_parent_class = g_type_class_peek_parent (klass);
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileWriterClass *) klass)->write = photo_file_writer_real_write;
-#line 995 "PhotoFileAdapter.c"
+#line 1069 "PhotoFileAdapter.c"
 }
 
 
@@ -1015,17 +1089,17 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type
 	PhotoFileMetadataWriter* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 1029 "PhotoFileAdapter.c"
+#line 1103 "PhotoFileAdapter.c"
 }
 
 
@@ -1036,52 +1110,52 @@ PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWrit
 	gchar* _tmp2_ = NULL;
 	PhotoFileReader* _tmp3_ = NULL;
 	PhotoFileReader* _tmp4_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp4_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 1058 "PhotoFileAdapter.c"
+#line 1132 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 1067 "PhotoFileAdapter.c"
+#line 1141 "PhotoFileAdapter.c"
 }
 
 
 void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error);
-#line 1076 "PhotoFileAdapter.c"
+#line 1150 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) {
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileMetadataWriterClass *) klass)->write_metadata = photo_file_metadata_writer_real_write_metadata;
-#line 1085 "PhotoFileAdapter.c"
+#line 1159 "PhotoFileAdapter.c"
 }
 
 
diff --git a/src/photos/PhotoFileAdapter.vala b/src/photos/PhotoFileAdapter.vala
index 644917c..df49edb 100644
--- a/src/photos/PhotoFileAdapter.vala
+++ b/src/photos/PhotoFileAdapter.vala
@@ -57,6 +57,13 @@ public abstract class PhotoFileAdapter {
 //
 
 public abstract class PhotoFileReader : PhotoFileAdapter {
+    public enum Role {
+        DEFAULT,
+        THUMBNAIL
+    }
+
+    PhotoFileReader.Role role = Role.DEFAULT;
+
     protected PhotoFileReader(string filepath, PhotoFileFormat file_format) {
         base (filepath, file_format);
     }
@@ -76,6 +83,14 @@ public abstract class PhotoFileReader : PhotoFileAdapter {
     public virtual Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
         return resize_pixbuf(unscaled_read(), scaled, Gdk.InterpType.BILINEAR);
     }
+
+    public void set_role (PhotoFileReader.Role role) {
+        this.role = role;
+    }
+
+    public PhotoFileReader.Role get_role () {
+        return this.role;
+    }
 }
 
 //
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 6569e3b..1b0d4b8 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -211,6 +211,8 @@ typedef struct _GRawProcessedImage GRawProcessedImage;
 typedef struct _GRawProcessedImageClass GRawProcessedImageClass;
 #define _graw_processed_image_unref0(var) ((var == NULL) ? NULL : (var = (graw_processed_image_unref (var), NULL)))
 
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 
 #define TYPE_BACKING_PHOTO_ROW (backing_photo_row_get_type ())
@@ -410,6 +412,11 @@ struct _RawReaderClass {
 };
 
 typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+typedef enum  {
 	RAW_DEVELOPER_SHOTWELL = 0,
 	RAW_DEVELOPER_CAMERA,
 	RAW_DEVELOPER_EMBEDDED
@@ -618,6 +625,10 @@ GType graw_processed_image_get_type (void) G_GNUC_CONST;
 GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error);
 GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self);
 static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+void graw_processor_unpack_thumb (GRawProcessor* self, GError** error);
+GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error);
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
 GType raw_developer_get_type (void) G_GNUC_CONST;
 RawDeveloper* raw_developer_as_array (int* result_length1);
@@ -654,14 +665,14 @@ void raw_file_format_driver_init (void) {
 	raw_file_format_driver_instance = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_init ();
-#line 658 "RawSupport.c"
+#line 669 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 665 "RawSupport.c"
+#line 676 "RawSupport.c"
 }
 
 
@@ -677,7 +688,7 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 681 "RawSupport.c"
+#line 692 "RawSupport.c"
 }
 
 
@@ -693,7 +704,7 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 697 "RawSupport.c"
+#line 708 "RawSupport.c"
 }
 
 
@@ -714,7 +725,7 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 718 "RawSupport.c"
+#line 729 "RawSupport.c"
 }
 
 
@@ -730,7 +741,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 734 "RawSupport.c"
+#line 745 "RawSupport.c"
 }
 
 
@@ -743,7 +754,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = FALSE;
 #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 747 "RawSupport.c"
+#line 758 "RawSupport.c"
 }
 
 
@@ -756,7 +767,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = FALSE;
 #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 760 "RawSupport.c"
+#line 771 "RawSupport.c"
 }
 
 
@@ -771,7 +782,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm
 	result = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 775 "RawSupport.c"
+#line 786 "RawSupport.c"
 }
 
 
@@ -786,7 +797,7 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ
 	result = NULL;
 #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 790 "RawSupport.c"
+#line 801 "RawSupport.c"
 }
 
 
@@ -810,7 +821,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 814 "RawSupport.c"
+#line 825 "RawSupport.c"
 }
 
 
@@ -820,14 +831,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) {
 	self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 824 "RawSupport.c"
+#line 835 "RawSupport.c"
 }
 
 
 RawFileFormatDriver* raw_file_format_driver_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER);
-#line 831 "RawSupport.c"
+#line 842 "RawSupport.c"
 }
 
 
@@ -852,7 +863,7 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = raw_file_format_driver_real_create_sniffer;
-#line 856 "RawSupport.c"
+#line 867 "RawSupport.c"
 }
 
 
@@ -866,7 +877,7 @@ static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj);
-#line 870 "RawSupport.c"
+#line 881 "RawSupport.c"
 }
 
 
@@ -890,14 +901,14 @@ void raw_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (raw_file_format_properties_instance);
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_instance = _tmp0_;
-#line 894 "RawSupport.c"
+#line 905 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 901 "RawSupport.c"
+#line 912 "RawSupport.c"
 }
 
 
@@ -913,7 +924,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
 	result = _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 917 "RawSupport.c"
+#line 928 "RawSupport.c"
 }
 
 
@@ -926,7 +937,7 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil
 	result = PHOTO_FILE_FORMAT_RAW;
 #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 930 "RawSupport.c"
+#line 941 "RawSupport.c"
 }
 
 
@@ -945,7 +956,7 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
 	result = _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 949 "RawSupport.c"
+#line 960 "RawSupport.c"
 }
 
 
@@ -958,7 +969,7 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 962 "RawSupport.c"
+#line 973 "RawSupport.c"
 }
 
 
@@ -974,7 +985,7 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo
 	result = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 978 "RawSupport.c"
+#line 989 "RawSupport.c"
 }
 
 
@@ -985,17 +996,17 @@ static gchar** _vala_array_dup12 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 989 "RawSupport.c"
+#line 1000 "RawSupport.c"
 		gchar* _tmp0_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 995 "RawSupport.c"
+#line 1006 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 999 "RawSupport.c"
+#line 1010 "RawSupport.c"
 }
 
 
@@ -1026,13 +1037,13 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 	if (result_length1) {
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1030 "RawSupport.c"
+#line 1041 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1036 "RawSupport.c"
+#line 1047 "RawSupport.c"
 }
 
 
@@ -1057,7 +1068,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
 	result = _tmp2_;
 #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1061 "RawSupport.c"
+#line 1072 "RawSupport.c"
 }
 
 
@@ -1068,17 +1079,17 @@ static gchar** _vala_array_dup13 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1072 "RawSupport.c"
+#line 1083 "RawSupport.c"
 		gchar* _tmp0_ = NULL;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1078 "RawSupport.c"
+#line 1089 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1082 "RawSupport.c"
+#line 1093 "RawSupport.c"
 }
 
 
@@ -1109,13 +1120,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 	if (result_length1) {
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1113 "RawSupport.c"
+#line 1124 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1119 "RawSupport.c"
+#line 1130 "RawSupport.c"
 }
 
 
@@ -1125,14 +1136,14 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type
 	self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1129 "RawSupport.c"
+#line 1140 "RawSupport.c"
 }
 
 
 RawFileFormatProperties* raw_file_format_properties_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES);
-#line 1136 "RawSupport.c"
+#line 1147 "RawSupport.c"
 }
 
 
@@ -1604,7 +1615,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 	raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_;
 #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51;
-#line 1608 "RawSupport.c"
+#line 1619 "RawSupport.c"
 }
 
 
@@ -1618,7 +1629,7 @@ static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj)
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj);
-#line 1622 "RawSupport.c"
+#line 1633 "RawSupport.c"
 }
 
 
@@ -1648,21 +1659,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
 	self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1652 "RawSupport.c"
+#line 1663 "RawSupport.c"
 }
 
 
 RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options);
-#line 1659 "RawSupport.c"
+#line 1670 "RawSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1666 "RawSupport.c"
+#line 1677 "RawSupport.c"
 }
 
 
@@ -1720,7 +1731,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp4_ = _tmp3_;
 #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 1724 "RawSupport.c"
+#line 1735 "RawSupport.c"
 	{
 		GRawProcessor* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
@@ -1744,7 +1755,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1748 "RawSupport.c"
+#line 1759 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1757,7 +1768,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1761 "RawSupport.c"
+#line 1772 "RawSupport.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp9_ = processor;
@@ -1767,7 +1778,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1771 "RawSupport.c"
+#line 1782 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1780,7 +1791,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1784 "RawSupport.c"
+#line 1795 "RawSupport.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = processor;
@@ -1790,7 +1801,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1794 "RawSupport.c"
+#line 1805 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1803,7 +1814,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1807 "RawSupport.c"
+#line 1818 "RawSupport.c"
 		}
 	}
 	goto __finally32;
@@ -1833,11 +1844,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			if (is_corrupted) {
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				*is_corrupted = _vala_is_corrupted;
-#line 1837 "RawSupport.c"
+#line 1848 "RawSupport.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 1841 "RawSupport.c"
+#line 1852 "RawSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp12_ = exception;
@@ -1847,7 +1858,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = _tmp13_;
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
-#line 1851 "RawSupport.c"
+#line 1862 "RawSupport.c"
 		goto __finally32;
 	}
 	__finally32:
@@ -1861,7 +1872,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1865 "RawSupport.c"
+#line 1876 "RawSupport.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = detected;
@@ -1905,7 +1916,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_g_free0 (_tmp26_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	reader = _tmp28_;
-#line 1909 "RawSupport.c"
+#line 1920 "RawSupport.c"
 	{
 		PhotoMetadata* _tmp29_ = NULL;
 		RawReader* _tmp30_ = NULL;
@@ -1920,7 +1931,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp29_ = _tmp31_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1924 "RawSupport.c"
+#line 1935 "RawSupport.c"
 			goto __catch33_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1935,7 +1946,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp32_->metadata = _tmp33_;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_media_metadata_unref0 (_tmp29_);
-#line 1939 "RawSupport.c"
+#line 1950 "RawSupport.c"
 	}
 	goto __finally33;
 	__catch33_g_error:
@@ -1947,7 +1958,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (err);
-#line 1951 "RawSupport.c"
+#line 1962 "RawSupport.c"
 	}
 	__finally33:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1962,7 +1973,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1966 "RawSupport.c"
+#line 1977 "RawSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = detected;
@@ -1970,7 +1981,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp35_ = _tmp34_->metadata;
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp35_ != NULL) {
-#line 1974 "RawSupport.c"
+#line 1985 "RawSupport.c"
 		guint8* flattened_sans_thumbnail = NULL;
 		DetectedPhotoInformation* _tmp36_ = NULL;
 		PhotoMetadata* _tmp37_ = NULL;
@@ -2009,7 +2020,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp41__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp41_ != NULL) {
-#line 2013 "RawSupport.c"
+#line 2024 "RawSupport.c"
 			guint8* _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2018,15 +2029,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_tmp42__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = _tmp42__length1 > 0;
-#line 2022 "RawSupport.c"
+#line 2033 "RawSupport.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = FALSE;
-#line 2026 "RawSupport.c"
+#line 2037 "RawSupport.c"
 		}
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp40_) {
-#line 2030 "RawSupport.c"
+#line 2041 "RawSupport.c"
 			DetectedPhotoInformation* _tmp43_ = NULL;
 			guint8* _tmp44_ = NULL;
 			gint _tmp44__length1 = 0;
@@ -2049,7 +2060,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp43_->exif_md5);
 #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp43_->exif_md5 = _tmp46_;
-#line 2053 "RawSupport.c"
+#line 2064 "RawSupport.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp47_ = detected;
@@ -2069,7 +2080,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp52__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp52_ != NULL) {
-#line 2073 "RawSupport.c"
+#line 2084 "RawSupport.c"
 			guint8* _tmp53_ = NULL;
 			gint _tmp53__length1 = 0;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2078,15 +2089,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_tmp53__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = _tmp53__length1 > 0;
-#line 2082 "RawSupport.c"
+#line 2093 "RawSupport.c"
 		} else {
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = FALSE;
-#line 2086 "RawSupport.c"
+#line 2097 "RawSupport.c"
 		}
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp51_) {
-#line 2090 "RawSupport.c"
+#line 2101 "RawSupport.c"
 			DetectedPhotoInformation* _tmp54_ = NULL;
 			guint8* _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
@@ -2109,19 +2120,19 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp54_->thumbnail_md5);
 #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2113 "RawSupport.c"
+#line 2124 "RawSupport.c"
 		}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 2119 "RawSupport.c"
+#line 2130 "RawSupport.c"
 	}
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp58_) {
-#line 2125 "RawSupport.c"
+#line 2136 "RawSupport.c"
 		gchar* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		gchar* _tmp61_ = NULL;
@@ -2145,7 +2156,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_detected_photo_information_unref0 (detected);
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 2149 "RawSupport.c"
+#line 2160 "RawSupport.c"
 		}
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp62_ = detected;
@@ -2159,7 +2170,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp62_->md5 = _tmp63_;
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp59_);
-#line 2163 "RawSupport.c"
+#line 2174 "RawSupport.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp64_ = detected;
@@ -2183,11 +2194,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (is_corrupted) {
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 2187 "RawSupport.c"
+#line 2198 "RawSupport.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2191 "RawSupport.c"
+#line 2202 "RawSupport.c"
 }
 
 
@@ -2196,7 +2207,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
 	raw_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = raw_sniffer_real_sniff;
-#line 2200 "RawSupport.c"
+#line 2211 "RawSupport.c"
 }
 
 
@@ -2227,14 +2238,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
 	self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 2231 "RawSupport.c"
+#line 2242 "RawSupport.c"
 }
 
 
 RawReader* raw_reader_new (const gchar* filepath) {
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2238 "RawSupport.c"
+#line 2249 "RawSupport.c"
 }
 
 
@@ -2268,13 +2279,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 		_media_metadata_unref0 (metadata);
 #line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2272 "RawSupport.c"
+#line 2283 "RawSupport.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = metadata;
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2278 "RawSupport.c"
+#line 2289 "RawSupport.c"
 }
 
 
@@ -2336,7 +2347,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2340 "RawSupport.c"
+#line 2351 "RawSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = processor;
@@ -2350,7 +2361,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2354 "RawSupport.c"
+#line 2365 "RawSupport.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = processor;
@@ -2364,7 +2375,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2368 "RawSupport.c"
+#line 2379 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = processor;
@@ -2380,7 +2391,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2384 "RawSupport.c"
+#line 2395 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = _tmp10_;
@@ -2402,7 +2413,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2406 "RawSupport.c"
+#line 2417 "RawSupport.c"
 }
 
 
@@ -2432,17 +2443,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GRawProcessor* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
-	GRawProcessor* _tmp20_ = NULL;
-	GRawProcessor* _tmp21_ = NULL;
+	GRawProcessor* _tmp30_ = NULL;
+	GRawProcessor* _tmp31_ = NULL;
 	GRawProcessedImage* image = NULL;
-	GRawProcessor* _tmp22_ = NULL;
-	GRawProcessedImage* _tmp23_ = NULL;
-	GRawProcessedImage* _tmp24_ = NULL;
-	GdkPixbuf* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	Dimensions _tmp27_ = {0};
-	GdkPixbuf* _tmp28_ = NULL;
-	GdkPixbuf* _tmp29_ = NULL;
+	GRawProcessor* _tmp32_ = NULL;
+	GRawProcessedImage* _tmp33_ = NULL;
+	GRawProcessedImage* _tmp34_ = NULL;
+	GdkPixbuf* _tmp35_ = NULL;
+	GdkPixbuf* _tmp36_ = NULL;
+	Dimensions _tmp37_ = {0};
+	GdkPixbuf* _tmp38_ = NULL;
+	GdkPixbuf* _tmp39_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2450,86 +2461,72 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	g_return_val_if_fail (full != NULL, NULL);
 #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = *scaled;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = *full;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = _tmp2_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
 #line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = *scaled;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = *full;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
 #line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = width_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp9_ < 0.5) {
-#line 2478 "RawSupport.c"
+#line 2489 "RawSupport.c"
 		gdouble _tmp10_ = 0.0;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = height_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = _tmp10_ < 0.5;
-#line 2484 "RawSupport.c"
+#line 2495 "RawSupport.c"
 	} else {
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = FALSE;
-#line 2488 "RawSupport.c"
+#line 2499 "RawSupport.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	half_size = _tmp8_;
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	processor = _tmp11_;
 #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	processor = _tmp11_;
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = processor;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = half_size;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
 #line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = processor;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp15_ = graw_processor_get_output_params (_tmp14_);
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp16_ = _tmp15_;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp17_ = processor;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp18_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp19_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		g_propagate_error (error, _inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_graw_processor_unref0 (processor);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		return NULL;
-#line 2528 "RawSupport.c"
-	}
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp20_ = processor;
+	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_unpack (_tmp20_, &_inner_error_);
+	_g_free0 (_tmp19_);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2538,12 +2535,83 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2542 "RawSupport.c"
+#line 2539 "RawSupport.c"
 	}
+	{
+		PhotoFileReaderRole _tmp20_ = 0;
+#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader));
+#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
+#line 2547 "RawSupport.c"
+			GRawProcessor* _tmp21_ = NULL;
+			GRawProcessedImage* image = NULL;
+			GRawProcessor* _tmp22_ = NULL;
+			GRawProcessedImage* _tmp23_ = NULL;
+			GRawProcessedImage* _tmp24_ = NULL;
+			GdkPixbuf* _tmp25_ = NULL;
+			GdkPixbuf* _tmp26_ = NULL;
+			Dimensions _tmp27_ = {0};
+			GdkPixbuf* _tmp28_ = NULL;
+			GdkPixbuf* _tmp29_ = NULL;
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp21_ = processor;
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			graw_processor_unpack_thumb (_tmp21_, &_inner_error_);
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2564 "RawSupport.c"
+				goto __catch34_g_error;
+			}
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp22_ = processor;
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_);
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			image = _tmp23_;
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2575 "RawSupport.c"
+				goto __catch34_g_error;
+			}
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp24_ = image;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp26_ = _tmp25_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp27_ = *scaled;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp29_ = _tmp28_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_g_object_unref0 (_tmp26_);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			result = _tmp29_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_graw_processed_image_unref0 (image);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_graw_processor_unref0 (processor);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			return result;
+#line 2600 "RawSupport.c"
+		}
+	}
+	goto __finally34;
+	__catch34_g_error:
+	{
+		GError* _error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp21_ = processor;
+		_error_ = _inner_error_;
+#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_inner_error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_process (_tmp21_, &_inner_error_);
+		_g_error_free0 (_error_);
+#line 2613 "RawSupport.c"
+	}
+	__finally34:
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2552,47 +2620,75 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2556 "RawSupport.c"
+#line 2624 "RawSupport.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp22_ = processor;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp23_ = graw_processor_make_mem_image (_tmp22_, &_inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	image = _tmp23_;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp30_ = processor;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_unpack (_tmp30_, &_inner_error_);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2572 "RawSupport.c"
+#line 2638 "RawSupport.c"
 	}
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp24_ = image;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp26_ = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp27_ = *scaled;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp29_ = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (_tmp26_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp31_ = processor;
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_process (_tmp31_, &_inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		g_propagate_error (error, _inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_graw_processor_unref0 (processor);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		return NULL;
+#line 2652 "RawSupport.c"
+	}
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp32_ = processor;
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	image = _tmp33_;
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		g_propagate_error (error, _inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_graw_processor_unref0 (processor);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		return NULL;
+#line 2668 "RawSupport.c"
+	}
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_ = image;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp36_ = _tmp35_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_ = *scaled;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp39_ = _tmp38_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (_tmp36_);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	result = _tmp39_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (image);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2596 "RawSupport.c"
+#line 2692 "RawSupport.c"
 }
 
 
@@ -2605,7 +2701,7 @@ static void raw_reader_class_init (RawReaderClass * klass) {
 	((PhotoFileReaderClass *) klass)->unscaled_read = raw_reader_real_unscaled_read;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = raw_reader_real_scaled_read;
-#line 2609 "RawSupport.c"
+#line 2705 "RawSupport.c"
 }
 
 
@@ -2630,80 +2726,80 @@ RawDeveloper* raw_developer_as_array (int* result_length1) {
 	RawDeveloper* _tmp0_ = NULL;
 	RawDeveloper* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_new0 (RawDeveloper, 3);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[0] = RAW_DEVELOPER_SHOTWELL;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[1] = RAW_DEVELOPER_CAMERA;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[2] = RAW_DEVELOPER_EMBEDDED;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = 3;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (result_length1) {
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 2650 "RawSupport.c"
+#line 2746 "RawSupport.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2656 "RawSupport.c"
+#line 2752 "RawSupport.c"
 }
 
 
 gchar* raw_developer_to_string (RawDeveloper self) {
 	gchar* result = NULL;
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2666 "RawSupport.c"
+#line 2762 "RawSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup ("SHOTWELL");
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2675 "RawSupport.c"
+#line 2771 "RawSupport.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 2679 "RawSupport.c"
+#line 2775 "RawSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup ("CAMERA");
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2688 "RawSupport.c"
+#line 2784 "RawSupport.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2692 "RawSupport.c"
+#line 2788 "RawSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = g_strdup ("EMBEDDED");
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2701 "RawSupport.c"
+#line 2797 "RawSupport.c"
 		}
 		default:
 		{
-#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2707 "RawSupport.c"
+#line 2803 "RawSupport.c"
 		}
 	}
 }
@@ -2714,69 +2810,69 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (value != NULL, 0);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = value;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2736 "RawSupport.c"
+#line 2832 "RawSupport.c"
 			default:
 			{
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_SHOTWELL;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2743 "RawSupport.c"
+#line 2839 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2749 "RawSupport.c"
+#line 2845 "RawSupport.c"
 			default:
 			{
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_CAMERA;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2756 "RawSupport.c"
+#line 2852 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2762 "RawSupport.c"
+#line 2858 "RawSupport.c"
 			default:
 			{
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_EMBEDDED;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2769 "RawSupport.c"
+#line 2865 "RawSupport.c"
 			}
 		}
 	} else {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2775 "RawSupport.c"
+#line 2871 "RawSupport.c"
 			default:
 			{
-#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				g_assert_not_reached ();
-#line 2780 "RawSupport.c"
+#line 2876 "RawSupport.c"
 			}
 		}
 	}
@@ -2785,47 +2881,47 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 
 gchar* raw_developer_get_label (RawDeveloper self) {
 	gchar* result = NULL;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2793 "RawSupport.c"
+#line 2889 "RawSupport.c"
 		{
 			const gchar* _tmp0_ = NULL;
 			gchar* _tmp1_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = _ ("Shotwell");
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup (_tmp0_);
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2805 "RawSupport.c"
+#line 2901 "RawSupport.c"
 		}
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2811 "RawSupport.c"
+#line 2907 "RawSupport.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = _ ("Camera");
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp3_;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2823 "RawSupport.c"
+#line 2919 "RawSupport.c"
 		}
 		default:
 		{
-#line 305 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2829 "RawSupport.c"
+#line 2925 "RawSupport.c"
 		}
 	}
 }
@@ -2836,68 +2932,68 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = d;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == _tmp0_) {
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2848 "RawSupport.c"
+#line 2944 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == RAW_DEVELOPER_CAMERA) {
-#line 2852 "RawSupport.c"
+#line 2948 "RawSupport.c"
 		RawDeveloper _tmp3_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp3_ = d;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2858 "RawSupport.c"
+#line 2954 "RawSupport.c"
 	} else {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = FALSE;
-#line 2862 "RawSupport.c"
+#line 2958 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp2_) {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = TRUE;
-#line 2868 "RawSupport.c"
+#line 2964 "RawSupport.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2873 "RawSupport.c"
+#line 2969 "RawSupport.c"
 			RawDeveloper _tmp5_ = 0;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp5_ = d;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2879 "RawSupport.c"
+#line 2975 "RawSupport.c"
 		} else {
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = FALSE;
-#line 2883 "RawSupport.c"
+#line 2979 "RawSupport.c"
 		}
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = _tmp4_;
-#line 2887 "RawSupport.c"
+#line 2983 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp1_) {
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2895 "RawSupport.c"
+#line 2991 "RawSupport.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2901 "RawSupport.c"
+#line 2997 "RawSupport.c"
 }
 
 
@@ -2932,41 +3028,41 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 	GFile* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (raw_filepath != NULL, NULL);
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ns = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = raw_filepath;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	master = _tmp2_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = master;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = g_file_get_basename (_tmp3_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	name = _tmp6_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ext = _tmp7_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = camera_development_filename;
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp8_ == NULL) {
-#line 2970 "RawSupport.c"
+#line 3066 "RawSupport.c"
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -2977,176 +3073,176 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self != RAW_DEVELOPER_CAMERA) {
-#line 2983 "RawSupport.c"
+#line 3079 "RawSupport.c"
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp10_ = raw_developer_to_string (self);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp13_ = _tmp12_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp14_ = g_strconcat ("_", _tmp13_, NULL);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp14_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp13_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp11_);
-#line 3007 "RawSupport.c"
+#line 3103 "RawSupport.c"
 		} else {
 			gchar* _tmp15_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp15_ = g_strdup ("");
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp15_;
-#line 3016 "RawSupport.c"
+#line 3112 "RawSupport.c"
 		}
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp16_ = name;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp17_ = g_strconcat (_tmp16_, "_", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp18_ = _tmp17_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp19_ = ext;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp21_ = _tmp20_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp23_ = _tmp22_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp24_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp23_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp21_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp18_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp9_);
-#line 3048 "RawSupport.c"
+#line 3144 "RawSupport.c"
 	} else {
 		const gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp25_ = camera_development_filename;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp26_ = g_strdup (_tmp25_);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp26_;
-#line 3060 "RawSupport.c"
+#line 3156 "RawSupport.c"
 	}
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp27_ = master;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp28_ = g_file_get_parent (_tmp27_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp29_ = _tmp28_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp30_ = basename;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	c = _tmp31_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp33_ = _tmp32_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp29_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	new_back = _tmp33_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3096 "RawSupport.c"
+#line 3192 "RawSupport.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = new_back;
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	claim_file (_tmp34_, &_inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (new_back);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3120 "RawSupport.c"
+#line 3216 "RawSupport.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_ = ns;
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_ = ns;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp37_ = new_back;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp38_ = g_file_get_path (_tmp37_);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp36_->filepath);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_->filepath = _tmp38_;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = ns;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (new_back);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (basename);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (master);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 3150 "RawSupport.c"
+#line 3246 "RawSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index 441b899..05f652c 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -240,6 +240,7 @@ public class RawReader : PhotoFileReader {
     }
     
     public override Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
+        // Try to get the embedded thumbnail first
         double width_proportion = (double) scaled.width / (double) full.width;
         double height_proportion = (double) scaled.height / (double) full.height;
         bool half_size = width_proportion < 0.5 && height_proportion < 0.5;
@@ -249,6 +250,18 @@ public class RawReader : PhotoFileReader {
         processor.output_params->user_flip = GRaw.Flip.NONE;
         
         processor.open_file(get_filepath());
+        try {
+            if (this.get_role () == Role.THUMBNAIL) {
+                processor.unpack_thumb();
+                var image = processor.make_thumb_image ();
+                return resize_pixbuf (image.get_pixbuf_copy (),
+                                      scaled,
+                                      Gdk.InterpType.BILINEAR);
+            }
+        } catch (Error error) {
+            // Nothing to do, continue with raw developer
+        }
+
         processor.unpack();
         processor.process();
         
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 2571817..af0f48d 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1428,7 +1428,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1431 "ManifestWidget.c"
-							goto __catch36_g_error;
+							goto __catch37_g_error;
 						}
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
@@ -1442,8 +1442,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_object_unref0 (_tmp50_);
 #line 1444 "ManifestWidget.c"
 					}
-					goto __finally36;
-					__catch36_g_error:
+					goto __finally37;
+					__catch37_g_error:
 					{
 						GError* err = NULL;
 						PluginsExtensionPoint* _tmp54_ = NULL;
@@ -1471,7 +1471,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_error_free0 (err);
 #line 1473 "ManifestWidget.c"
 					}
-					__finally36:
+					__finally37:
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 983b44c..c6ccfad 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1894,11 +1894,11 @@ void plugins_init (GError** error) {
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1896 "Plugins.c"
-						goto __catch34_g_error;
+						goto __catch35_g_error;
 					}
 				}
-				goto __finally34;
-				__catch34_g_error:
+				goto __finally35;
+				__catch35_g_error:
 				{
 					GError* err = NULL;
 					GFile* _tmp13_ = NULL;
@@ -1928,7 +1928,7 @@ void plugins_init (GError** error) {
 					_g_error_free0 (err);
 #line 1929 "Plugins.c"
 				}
-				__finally34:
+				__finally35:
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3801,11 +3801,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3803 "Plugins.c"
-							goto __catch35_g_error;
+							goto __catch36_g_error;
 						}
 					}
-					goto __finally35;
-					__catch35_g_error:
+					goto __finally36;
+					__catch36_g_error:
 					{
 						GError* err = NULL;
 						GFile* _tmp18_ = NULL;
@@ -3835,7 +3835,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_error_free0 (err);
 #line 3836 "Plugins.c"
 					}
-					__finally35:
+					__finally36:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index 22cfa5a..4dfb6a4 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -16,6 +16,7 @@
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#include <gee.h>
 
 
 #define SPIT_PUBLISHING_TYPE_PUBLISHER (spit_publishing_publisher_get_type ())
@@ -83,6 +84,22 @@ typedef struct _SpitPublishingPublishableIface SpitPublishingPublishableIface;
 
 #define SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE (spit_publishing_publisher_media_type_get_type ())
 
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR (spit_publishing_authenticator_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR))
+#define SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticatorIface))
+
+typedef struct _SpitPublishingAuthenticator SpitPublishingAuthenticator;
+typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIface;
+
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY))
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactoryIface))
+
+typedef struct _SpitPublishingAuthenticatorFactory SpitPublishingAuthenticatorFactory;
+typedef struct _SpitPublishingAuthenticatorFactoryIface SpitPublishingAuthenticatorFactoryIface;
+
 /**
  * Defines different kinds of errors that can occur during publishing.
  */
@@ -261,6 +278,21 @@ struct _SpitPublishingPublisherIface {
 	void (*reserved7) (SpitPublishingPublisher* self);
 };
 
+struct _SpitPublishingAuthenticatorIface {
+	GTypeInterface parent_iface;
+	void (*authenticate) (SpitPublishingAuthenticator* self);
+	gboolean (*can_logout) (SpitPublishingAuthenticator* self);
+	void (*logout) (SpitPublishingAuthenticator* self);
+	void (*refresh) (SpitPublishingAuthenticator* self);
+	GHashTable* (*get_authentication_parameter) (SpitPublishingAuthenticator* self);
+};
+
+struct _SpitPublishingAuthenticatorFactoryIface {
+	GTypeInterface parent_iface;
+	GeeList* (*get_available_authenticators) (SpitPublishingAuthenticatorFactory* self);
+	SpitPublishingAuthenticator* (*create) (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
+};
+
 
 
 #define SPIT_PUBLISHING_CURRENT_INTERFACE 0
@@ -395,6 +427,15 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self);
 static void spit_publishing_service_real_reserved6 (SpitPublishingService* self);
 void spit_publishing_service_reserved7 (SpitPublishingService* self);
 static void spit_publishing_service_real_reserved7 (SpitPublishingService* self);
+GType spit_publishing_authenticator_get_type (void) G_GNUC_CONST;
+void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self);
+gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self);
+GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self);
+GType spit_publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
+GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self);
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
 
 
 GQuark spit_publishing_publishing_error_quark (void) {
@@ -428,7 +469,7 @@ SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPubl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), NULL);
 #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->get_service (self);
-#line 432 "PublishingInterfaces.c"
+#line 473 "PublishingInterfaces.c"
 }
 
 
@@ -443,7 +484,7 @@ void spit_publishing_publisher_start (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->start (self);
-#line 447 "PublishingInterfaces.c"
+#line 488 "PublishingInterfaces.c"
 }
 
 
@@ -455,7 +496,7 @@ gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) {
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->is_running (self);
-#line 459 "PublishingInterfaces.c"
+#line 500 "PublishingInterfaces.c"
 }
 
 
@@ -468,7 +509,7 @@ void spit_publishing_publisher_stop (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->stop (self);
-#line 472 "PublishingInterfaces.c"
+#line 513 "PublishingInterfaces.c"
 }
 
 
@@ -481,7 +522,7 @@ void spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved0 (self);
-#line 485 "PublishingInterfaces.c"
+#line 526 "PublishingInterfaces.c"
 }
 
 
@@ -494,7 +535,7 @@ void spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved1 (self);
-#line 498 "PublishingInterfaces.c"
+#line 539 "PublishingInterfaces.c"
 }
 
 
@@ -507,7 +548,7 @@ void spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved2 (self);
-#line 511 "PublishingInterfaces.c"
+#line 552 "PublishingInterfaces.c"
 }
 
 
@@ -520,7 +561,7 @@ void spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved3 (self);
-#line 524 "PublishingInterfaces.c"
+#line 565 "PublishingInterfaces.c"
 }
 
 
@@ -533,7 +574,7 @@ void spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved4 (self);
-#line 537 "PublishingInterfaces.c"
+#line 578 "PublishingInterfaces.c"
 }
 
 
@@ -546,7 +587,7 @@ void spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved5 (self);
-#line 550 "PublishingInterfaces.c"
+#line 591 "PublishingInterfaces.c"
 }
 
 
@@ -559,7 +600,7 @@ void spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved6 (self);
-#line 563 "PublishingInterfaces.c"
+#line 604 "PublishingInterfaces.c"
 }
 
 
@@ -572,7 +613,7 @@ void spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved7 (self);
-#line 576 "PublishingInterfaces.c"
+#line 617 "PublishingInterfaces.c"
 }
 
 
@@ -599,7 +640,7 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface *
 		iface->reserved6 = spit_publishing_publisher_real_reserved6;
 #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publisher_real_reserved7;
-#line 603 "PublishingInterfaces.c"
+#line 644 "PublishingInterfaces.c"
 	}
 }
 
@@ -651,7 +692,7 @@ GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* sel
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), NULL);
 #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self);
-#line 655 "PublishingInterfaces.c"
+#line 696 "PublishingInterfaces.c"
 }
 
 
@@ -664,7 +705,7 @@ SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferre
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), 0);
 #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self);
-#line 668 "PublishingInterfaces.c"
+#line 709 "PublishingInterfaces.c"
 }
 
 
@@ -677,7 +718,7 @@ void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* se
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self);
-#line 681 "PublishingInterfaces.c"
+#line 722 "PublishingInterfaces.c"
 }
 
 
@@ -690,7 +731,7 @@ void spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane*
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self);
-#line 694 "PublishingInterfaces.c"
+#line 735 "PublishingInterfaces.c"
 }
 
 
@@ -703,7 +744,7 @@ void spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self);
-#line 707 "PublishingInterfaces.c"
+#line 748 "PublishingInterfaces.c"
 }
 
 
@@ -716,7 +757,7 @@ void spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self);
-#line 720 "PublishingInterfaces.c"
+#line 761 "PublishingInterfaces.c"
 }
 
 
@@ -729,7 +770,7 @@ void spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self);
-#line 733 "PublishingInterfaces.c"
+#line 774 "PublishingInterfaces.c"
 }
 
 
@@ -742,7 +783,7 @@ void spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self);
-#line 746 "PublishingInterfaces.c"
+#line 787 "PublishingInterfaces.c"
 }
 
 
@@ -755,7 +796,7 @@ void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self);
-#line 759 "PublishingInterfaces.c"
+#line 800 "PublishingInterfaces.c"
 }
 
 
@@ -768,7 +809,7 @@ void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self);
-#line 772 "PublishingInterfaces.c"
+#line 813 "PublishingInterfaces.c"
 }
 
 
@@ -781,7 +822,7 @@ void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self);
-#line 785 "PublishingInterfaces.c"
+#line 826 "PublishingInterfaces.c"
 }
 
 
@@ -794,7 +835,7 @@ void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self);
-#line 798 "PublishingInterfaces.c"
+#line 839 "PublishingInterfaces.c"
 }
 
 
@@ -821,7 +862,7 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface
 		iface->reserved6 = spit_publishing_dialog_pane_real_reserved6;
 #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_dialog_pane_real_reserved7;
-#line 825 "PublishingInterfaces.c"
+#line 866 "PublishingInterfaces.c"
 	}
 }
 
@@ -871,7 +912,7 @@ void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GEr
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err);
-#line 875 "PublishingInterfaces.c"
+#line 916 "PublishingInterfaces.c"
 }
 
 
@@ -886,7 +927,7 @@ void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->stop_publishing (self);
-#line 890 "PublishingInterfaces.c"
+#line 931 "PublishingInterfaces.c"
 }
 
 
@@ -898,7 +939,7 @@ SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publisher (self);
-#line 902 "PublishingInterfaces.c"
+#line 943 "PublishingInterfaces.c"
 }
 
 
@@ -925,7 +966,7 @@ void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode);
-#line 929 "PublishingInterfaces.c"
+#line 970 "PublishingInterfaces.c"
 }
 
 
@@ -960,7 +1001,7 @@ void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPlug
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode);
-#line 964 "PublishingInterfaces.c"
+#line 1005 "PublishingInterfaces.c"
 }
 
 
@@ -987,7 +1028,7 @@ void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPlugi
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_pango_message_pane (self, markup, mode);
-#line 991 "PublishingInterfaces.c"
+#line 1032 "PublishingInterfaces.c"
 }
 
 
@@ -1008,7 +1049,7 @@ void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_success_pane (self);
-#line 1012 "PublishingInterfaces.c"
+#line 1053 "PublishingInterfaces.c"
 }
 
 
@@ -1031,7 +1072,7 @@ void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishing
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_account_fetch_wait_pane (self);
-#line 1035 "PublishingInterfaces.c"
+#line 1076 "PublishingInterfaces.c"
 }
 
 
@@ -1051,7 +1092,7 @@ void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHo
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_login_wait_pane (self);
-#line 1055 "PublishingInterfaces.c"
+#line 1096 "PublishingInterfaces.c"
 }
 
 
@@ -1080,7 +1121,7 @@ void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_welcome_pane (self, welcome_message, on_login_clicked, on_login_clicked_target);
-#line 1084 "PublishingInterfaces.c"
+#line 1125 "PublishingInterfaces.c"
 }
 
 
@@ -1103,7 +1144,7 @@ void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* s
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_service_locked (self, is_locked);
-#line 1107 "PublishingInterfaces.c"
+#line 1148 "PublishingInterfaces.c"
 }
 
 
@@ -1122,7 +1163,7 @@ void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPlugin
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_dialog_default_widget (self, widget);
-#line 1126 "PublishingInterfaces.c"
+#line 1167 "PublishingInterfaces.c"
 }
 
 
@@ -1135,7 +1176,7 @@ SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPu
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishables (self, result_length1);
-#line 1139 "PublishingInterfaces.c"
+#line 1180 "PublishingInterfaces.c"
 }
 
 
@@ -1174,7 +1215,7 @@ SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishable
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->serialize_publishables (self, content_major_axis, strip_metadata, result_target, result_target_destroy_notify);
-#line 1178 "PublishingInterfaces.c"
+#line 1219 "PublishingInterfaces.c"
 }
 
 
@@ -1188,7 +1229,7 @@ SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_med
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), 0);
 #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishable_media_type (self);
-#line 1192 "PublishingInterfaces.c"
+#line 1233 "PublishingInterfaces.c"
 }
 
 
@@ -1201,7 +1242,7 @@ void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self);
-#line 1205 "PublishingInterfaces.c"
+#line 1246 "PublishingInterfaces.c"
 }
 
 
@@ -1214,7 +1255,7 @@ void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self);
-#line 1218 "PublishingInterfaces.c"
+#line 1259 "PublishingInterfaces.c"
 }
 
 
@@ -1227,7 +1268,7 @@ void spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self);
-#line 1231 "PublishingInterfaces.c"
+#line 1272 "PublishingInterfaces.c"
 }
 
 
@@ -1240,7 +1281,7 @@ void spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self);
-#line 1244 "PublishingInterfaces.c"
+#line 1285 "PublishingInterfaces.c"
 }
 
 
@@ -1253,7 +1294,7 @@ void spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self);
-#line 1257 "PublishingInterfaces.c"
+#line 1298 "PublishingInterfaces.c"
 }
 
 
@@ -1266,7 +1307,7 @@ void spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self);
-#line 1270 "PublishingInterfaces.c"
+#line 1311 "PublishingInterfaces.c"
 }
 
 
@@ -1279,7 +1320,7 @@ void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self);
-#line 1283 "PublishingInterfaces.c"
+#line 1324 "PublishingInterfaces.c"
 }
 
 
@@ -1292,7 +1333,7 @@ void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self);
-#line 1296 "PublishingInterfaces.c"
+#line 1337 "PublishingInterfaces.c"
 }
 
 
@@ -1319,7 +1360,7 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface
 		iface->reserved6 = spit_publishing_plugin_host_real_reserved6;
 #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_plugin_host_real_reserved7;
-#line 1323 "PublishingInterfaces.c"
+#line 1364 "PublishingInterfaces.c"
 	}
 }
 
@@ -1362,7 +1403,7 @@ GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_serialized_file (self);
-#line 1366 "PublishingInterfaces.c"
+#line 1407 "PublishingInterfaces.c"
 }
 
 
@@ -1378,7 +1419,7 @@ gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_name (self);
-#line 1382 "PublishingInterfaces.c"
+#line 1423 "PublishingInterfaces.c"
 }
 
 
@@ -1391,7 +1432,7 @@ gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable*
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_param_string (self, name);
-#line 1395 "PublishingInterfaces.c"
+#line 1436 "PublishingInterfaces.c"
 }
 
 
@@ -1404,7 +1445,7 @@ gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPubli
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_keywords (self, result_length1);
-#line 1408 "PublishingInterfaces.c"
+#line 1449 "PublishingInterfaces.c"
 }
 
 
@@ -1416,7 +1457,7 @@ SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (Spi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), 0);
 #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_media_type (self);
-#line 1420 "PublishingInterfaces.c"
+#line 1461 "PublishingInterfaces.c"
 }
 
 
@@ -1428,7 +1469,7 @@ GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPub
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_exposure_date_time (self);
-#line 1432 "PublishingInterfaces.c"
+#line 1473 "PublishingInterfaces.c"
 }
 
 
@@ -1441,7 +1482,7 @@ void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved0 (self);
-#line 1445 "PublishingInterfaces.c"
+#line 1486 "PublishingInterfaces.c"
 }
 
 
@@ -1454,7 +1495,7 @@ void spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved1 (self);
-#line 1458 "PublishingInterfaces.c"
+#line 1499 "PublishingInterfaces.c"
 }
 
 
@@ -1467,7 +1508,7 @@ void spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved2 (self);
-#line 1471 "PublishingInterfaces.c"
+#line 1512 "PublishingInterfaces.c"
 }
 
 
@@ -1480,7 +1521,7 @@ void spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved3 (self);
-#line 1484 "PublishingInterfaces.c"
+#line 1525 "PublishingInterfaces.c"
 }
 
 
@@ -1493,7 +1534,7 @@ void spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved4 (self);
-#line 1497 "PublishingInterfaces.c"
+#line 1538 "PublishingInterfaces.c"
 }
 
 
@@ -1506,7 +1547,7 @@ void spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved5 (self);
-#line 1510 "PublishingInterfaces.c"
+#line 1551 "PublishingInterfaces.c"
 }
 
 
@@ -1519,7 +1560,7 @@ void spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved6 (self);
-#line 1523 "PublishingInterfaces.c"
+#line 1564 "PublishingInterfaces.c"
 }
 
 
@@ -1532,7 +1573,7 @@ void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved7 (self);
-#line 1536 "PublishingInterfaces.c"
+#line 1577 "PublishingInterfaces.c"
 }
 
 
@@ -1559,7 +1600,7 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac
 		iface->reserved6 = spit_publishing_publishable_real_reserved6;
 #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publishable_real_reserved7;
-#line 1563 "PublishingInterfaces.c"
+#line 1604 "PublishingInterfaces.c"
 	}
 }
 
@@ -1590,7 +1631,7 @@ SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishin
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->create_publisher (self, host);
-#line 1594 "PublishingInterfaces.c"
+#line 1635 "PublishingInterfaces.c"
 }
 
 
@@ -1602,7 +1643,7 @@ SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (Sp
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), 0);
 #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->get_supported_media (self);
-#line 1606 "PublishingInterfaces.c"
+#line 1647 "PublishingInterfaces.c"
 }
 
 
@@ -1615,7 +1656,7 @@ void spit_publishing_service_reserved0 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved0 (self);
-#line 1619 "PublishingInterfaces.c"
+#line 1660 "PublishingInterfaces.c"
 }
 
 
@@ -1628,7 +1669,7 @@ void spit_publishing_service_reserved1 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved1 (self);
-#line 1632 "PublishingInterfaces.c"
+#line 1673 "PublishingInterfaces.c"
 }
 
 
@@ -1641,7 +1682,7 @@ void spit_publishing_service_reserved2 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved2 (self);
-#line 1645 "PublishingInterfaces.c"
+#line 1686 "PublishingInterfaces.c"
 }
 
 
@@ -1654,7 +1695,7 @@ void spit_publishing_service_reserved3 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved3 (self);
-#line 1658 "PublishingInterfaces.c"
+#line 1699 "PublishingInterfaces.c"
 }
 
 
@@ -1667,7 +1708,7 @@ void spit_publishing_service_reserved4 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved4 (self);
-#line 1671 "PublishingInterfaces.c"
+#line 1712 "PublishingInterfaces.c"
 }
 
 
@@ -1680,7 +1721,7 @@ void spit_publishing_service_reserved5 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved5 (self);
-#line 1684 "PublishingInterfaces.c"
+#line 1725 "PublishingInterfaces.c"
 }
 
 
@@ -1693,7 +1734,7 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved6 (self);
-#line 1697 "PublishingInterfaces.c"
+#line 1738 "PublishingInterfaces.c"
 }
 
 
@@ -1706,7 +1747,7 @@ void spit_publishing_service_reserved7 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved7 (self);
-#line 1710 "PublishingInterfaces.c"
+#line 1751 "PublishingInterfaces.c"
 }
 
 
@@ -1733,7 +1774,7 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac
 		iface->reserved6 = spit_publishing_service_real_reserved6;
 #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_service_real_reserved7;
-#line 1737 "PublishingInterfaces.c"
+#line 1778 "PublishingInterfaces.c"
 	}
 }
 
@@ -1757,4 +1798,121 @@ GType spit_publishing_service_get_type (void) {
 }
 
 
+void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self) {
+#line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->authenticate (self);
+#line 1807 "PublishingInterfaces.c"
+}
+
+
+gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self) {
+#line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), FALSE);
+#line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->can_logout (self);
+#line 1816 "PublishingInterfaces.c"
+}
+
+
+void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) {
+#line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->logout (self);
+#line 1825 "PublishingInterfaces.c"
+}
+
+
+void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) {
+#line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->refresh (self);
+#line 1834 "PublishingInterfaces.c"
+}
+
+
+GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self) {
+#line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), NULL);
+#line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->get_authentication_parameter (self);
+#line 1843 "PublishingInterfaces.c"
+}
+
+
+static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticatorIface * iface) {
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	static gboolean initialized = FALSE;
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	if (!initialized) {
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		initialized = TRUE;
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		g_signal_new ("authentication_failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1858 "PublishingInterfaces.c"
+	}
+}
+
+
+GType spit_publishing_authenticator_get_type (void) {
+	static volatile gsize spit_publishing_authenticator_type_id__volatile = 0;
+	if (g_once_init_enter (&spit_publishing_authenticator_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorIface), (GBaseInitFunc) spit_publishing_authenticator_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType spit_publishing_authenticator_type_id;
+		spit_publishing_authenticator_type_id = g_type_register_static (G_TYPE_INTERFACE, "SpitPublishingAuthenticator", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (spit_publishing_authenticator_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&spit_publishing_authenticator_type_id__volatile, spit_publishing_authenticator_type_id);
+	}
+	return spit_publishing_authenticator_type_id__volatile;
+}
+
+
+GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self) {
+#line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
+#line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->get_available_authenticators (self);
+#line 1881 "PublishingInterfaces.c"
+}
+
+
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host) {
+#line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
+#line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->create (self, provider, host);
+#line 1890 "PublishingInterfaces.c"
+}
+
+
+static void spit_publishing_authenticator_factory_base_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	static gboolean initialized = FALSE;
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	if (!initialized) {
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		initialized = TRUE;
+#line 1901 "PublishingInterfaces.c"
+	}
+}
+
+
+GType spit_publishing_authenticator_factory_get_type (void) {
+	static volatile gsize spit_publishing_authenticator_factory_type_id__volatile = 0;
+	if (g_once_init_enter (&spit_publishing_authenticator_factory_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorFactoryIface), (GBaseInitFunc) spit_publishing_authenticator_factory_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType spit_publishing_authenticator_factory_type_id;
+		spit_publishing_authenticator_factory_type_id = g_type_register_static (G_TYPE_INTERFACE, "SpitPublishingAuthenticatorFactory", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (spit_publishing_authenticator_factory_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&spit_publishing_authenticator_factory_type_id__volatile, spit_publishing_authenticator_factory_type_id);
+	}
+	return spit_publishing_authenticator_factory_type_id__volatile;
+}
+
+
 
diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
index 7a8ac40..6518142 100644
--- a/src/plugins/PublishingInterfaces.vala
+++ b/src/plugins/PublishingInterfaces.vala
@@ -608,5 +608,27 @@ public interface Service : Object, Spit.Pluggable {
     protected virtual void reserved7() {}
 }
 
+public interface Authenticator : Object {
+    public signal void authenticated();
+    public signal void authentication_failed();
+
+    public abstract void authenticate();
+    public abstract bool can_logout();
+    public abstract void logout();
+    public abstract void refresh();
+
+    public abstract GLib.HashTable<string, Variant> get_authentication_parameter();
+}
+
+public interface AuthenticatorFactory : Object {
+    // By contract, every AuthenticatorFactory implementation needs to have a
+    // static get_instance() method. Unfortunately this is not expressable in
+    // Vala.
+
+    public abstract Gee.List<string> get_available_authenticators();
+    public abstract Authenticator? create(string provider,
+            Spit.Publishing.PluginHost host);
+}
+
 }
 
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 690d2b3..f58aaba 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -416,11 +416,11 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 419 "APIGlue.c"
-			goto __catch38_g_error;
+			goto __catch39_g_error;
 		}
 	}
-	goto __finally38;
-	__catch38_g_error:
+	goto __finally39;
+	__catch39_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally38:
+	__finally39:
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -692,11 +692,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 694 "APIGlue.c"
-				goto __catch39_g_error;
+				goto __catch40_g_error;
 			}
 		}
-		goto __finally39;
-		__catch39_g_error:
+		goto __finally40;
+		__catch40_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_ = NULL;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_g_error_free0 (err);
 #line 727 "APIGlue.c"
-			goto __finally39;
+			goto __finally40;
 		}
-		__finally39:
+		__finally40:
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -882,11 +882,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "APIGlue.c"
-					goto __catch40_g_error;
+					goto __catch41_g_error;
 				}
 			}
-			goto __finally40;
-			__catch40_g_error:
+			goto __finally41;
+			__catch41_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_ = NULL;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_error_free0 (err);
 #line 916 "APIGlue.c"
-				goto __finally40;
+				goto __finally41;
 			}
-			__finally40:
+			__finally41:
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 49208ca..3fbf248 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1273,7 +1273,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1272 "PublishingPluginHost.c"
-							goto __catch37_spit_publishing_publishing_error;
+							goto __catch38_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1293,8 +1293,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1291 "PublishingPluginHost.c"
 				}
-				goto __finally37;
-				__catch37_spit_publishing_publishing_error:
+				goto __finally38;
+				__catch38_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_ = NULL;
@@ -1331,7 +1331,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1329 "PublishingPluginHost.c"
 				}
-				__finally37:
+				__finally38:
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index c202931..3abe9a9 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -544,6 +544,7 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void searches_header_setup_context_menu (SearchesHeader* self);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -607,14 +608,14 @@ static void searches_sidebar_entry_finalize (GObject* obj);
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 611 "Branch.c"
+#line 612 "Branch.c"
 }
 
 
 static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 618 "Branch.c"
+#line 619 "Branch.c"
 }
 
 
@@ -623,7 +624,7 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo
 	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 627 "Branch.c"
+#line 628 "Branch.c"
 }
 
 
@@ -643,7 +644,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 647 "Branch.c"
+#line 648 "Branch.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp2_ = NULL;
@@ -672,7 +673,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 		_search_it = _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		while (TRUE) {
-#line 676 "Branch.c"
+#line 677 "Branch.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			SavedSearch* search = NULL;
@@ -687,7 +688,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			if (!_tmp9_) {
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 				break;
-#line 691 "Branch.c"
+#line 692 "Branch.c"
 			}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp10_ = _search_it;
@@ -701,11 +702,11 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			searches_branch_on_saved_search_added (self, _tmp12_);
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_object_unref0 (search);
-#line 705 "Branch.c"
+#line 706 "Branch.c"
 		}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_search_it);
-#line 709 "Branch.c"
+#line 710 "Branch.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp13_ = saved_search_table_get_instance ();
@@ -725,14 +726,14 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	_saved_search_table_unref0 (_tmp16_);
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 729 "Branch.c"
+#line 730 "Branch.c"
 }
 
 
 SearchesBranch* searches_branch_new (void) {
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 736 "Branch.c"
+#line 737 "Branch.c"
 }
 
 
@@ -755,7 +756,7 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 	result = (SearchesSidebarEntry*) _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 759 "Branch.c"
+#line 760 "Branch.c"
 }
 
 
@@ -782,7 +783,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return result;
-#line 786 "Branch.c"
+#line 787 "Branch.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = a;
@@ -798,7 +799,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 802 "Branch.c"
+#line 803 "Branch.c"
 }
 
 
@@ -838,7 +839,7 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 	_g_object_unref0 (_tmp5_);
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 842 "Branch.c"
+#line 843 "Branch.c"
 }
 
 
@@ -881,7 +882,7 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 885 "Branch.c"
+#line 886 "Branch.c"
 }
 
 
@@ -892,7 +893,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 896 "Branch.c"
+#line 897 "Branch.c"
 }
 
 
@@ -904,7 +905,7 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 908 "Branch.c"
+#line 909 "Branch.c"
 }
 
 
@@ -942,7 +943,7 @@ static void searches_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 946 "Branch.c"
+#line 947 "Branch.c"
 }
 
 
@@ -969,21 +970,21 @@ SearchesHeader* searches_header_construct (GType object_type) {
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 973 "Branch.c"
+#line 974 "Branch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 980 "Branch.c"
+#line 981 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 987 "Branch.c"
+#line 988 "Branch.c"
 }
 
 
@@ -998,85 +999,93 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1002 "Branch.c"
+#line 1003 "Branch.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_ = NULL;
+		GObject* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GMenuModel* _tmp7_ = NULL;
+		GtkMenu* _tmp8_ = NULL;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/search_sidebar_context.ui", &_inner_error_);
+		_tmp2_ = resources_get_ui ("search_sidebar_context.ui");
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp3_ = _tmp2_;
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_free0 (_tmp3_);
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1017 "Branch.c"
-			goto __catch75_g_error;
+#line 1026 "Branch.c"
+			goto __catch76_g_error;
 		}
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp4_ = self->priv->builder;
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		model = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp2_ = self->priv->builder;
+		_tmp7_ = model;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
+		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+		g_object_ref_sink (_tmp8_);
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		model = _tmp4_;
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = model;
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		g_object_ref_sink (_tmp6_);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		self->priv->context_menu = _tmp6_;
+#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		self->priv->context_menu = _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (model);
-#line 1040 "Branch.c"
+#line 1049 "Branch.c"
 	}
-	goto __finally75;
-	__catch75_g_error:
+	goto __finally76;
+	__catch76_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
+		GError* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		Application* _tmp13_ = NULL;
+		Application* _tmp14_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_error_ = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_inner_error_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp7_ = _error_;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp8_ = _tmp7_->message;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp10_ = _tmp9_;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp10_);
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp11_ = application_get_instance ();
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp9_ = _error_;
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp10_ = _tmp9_->message;
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp12_ = _tmp11_;
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		application_panic (_tmp12_);
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_application_unref0 (_tmp12_);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		app_window_error_message (_tmp12_, NULL);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_free0 (_tmp12_);
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp13_ = application_get_instance ();
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp14_ = _tmp13_;
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		application_panic (_tmp14_);
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_application_unref0 (_tmp14_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1078 "Branch.c"
+#line 1087 "Branch.c"
 	}
-	__finally75:
+	__finally76:
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1085,7 +1094,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return;
-#line 1089 "Branch.c"
+#line 1098 "Branch.c"
 	}
 }
 
@@ -1095,17 +1104,17 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1109 "Branch.c"
+#line 1118 "Branch.c"
 }
 
 
@@ -1116,7 +1125,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1120 "Branch.c"
+#line 1129 "Branch.c"
 }
 
 
@@ -1125,7 +1134,7 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1129 "Branch.c"
+#line 1138 "Branch.c"
 }
 
 
@@ -1134,7 +1143,7 @@ static void searches_header_instance_init (SearchesHeader * self) {
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 1138 "Branch.c"
+#line 1147 "Branch.c"
 }
 
 
@@ -1148,7 +1157,7 @@ static void searches_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1152 "Branch.c"
+#line 1161 "Branch.c"
 }
 
 
@@ -1170,28 +1179,28 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	SearchesSidebarEntry * self = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = search;
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->search = _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+	self->priv->search = _tmp1_;
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 1188 "Branch.c"
+#line 1197 "Branch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1195 "Branch.c"
+#line 1204 "Branch.c"
 }
 
 
@@ -1207,17 +1216,17 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	SavedSearch* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1221 "Branch.c"
+#line 1230 "Branch.c"
 }
 
 
@@ -1226,17 +1235,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	gchar* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1240 "Branch.c"
+#line 1249 "Branch.c"
 }
 
 
@@ -1245,17 +1254,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = searches_sidebar_entry_single_search_icon;
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1259 "Branch.c"
+#line 1268 "Branch.c"
 }
 
 
@@ -1264,32 +1273,32 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	Page* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearchPage* _tmp1_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = saved_search_page_new (_tmp0_);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1280 "Branch.c"
+#line 1289 "Branch.c"
 }
 
 
 static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	SearchesSidebarEntry * self;
 	gboolean result = FALSE;
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = TRUE;
-#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1293 "Branch.c"
+#line 1302 "Branch.c"
 }
 
 
@@ -1300,85 +1309,85 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = saved_search_table_get_instance ();
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = new_name;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp4_ = !_tmp3_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp4_) {
-#line 1322 "Branch.c"
+#line 1331 "Branch.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		SavedSearch* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		RenameSavedSearchCommand* _tmp9_ = NULL;
 		RenameSavedSearchCommand* _tmp10_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = app_window_get_command_manager ();
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp7_ = self->priv->search;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp8_ = new_name;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp10_ = _tmp9_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1347 "Branch.c"
+#line 1356 "Branch.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 		SavedSearch* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp11_ = new_name;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp12_ = self->priv->search;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp14_ = _tmp13_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_free0 (_tmp14_);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (_tmp15_) {
-#line 1368 "Branch.c"
+#line 1377 "Branch.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp16_ = new_name;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp18_ = _tmp17_;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_free0 (_tmp18_);
-#line 1382 "Branch.c"
+#line 1391 "Branch.c"
 		}
 	}
 }
@@ -1388,99 +1397,99 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	SearchesSidebarEntry * self;
 	SavedSearch* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp1_) {
-#line 1400 "Branch.c"
+#line 1409 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
 		DeleteSavedSearchCommand* _tmp5_ = NULL;
 		DeleteSavedSearchCommand* _tmp6_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp4_ = self->priv->search;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1422 "Branch.c"
+#line 1431 "Branch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
 	gchar* _tmp0_ = NULL;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = searches_sidebar_entry_real_get_sidebar_name;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = searches_sidebar_entry_real_get_sidebar_icon;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = searches_sidebar_entry_real_create_page;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = g_strdup ("find");
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1445 "Branch.c"
+#line 1454 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1456 "Branch.c"
+#line 1465 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source;
-#line 1465 "Branch.c"
+#line 1474 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1472 "Branch.c"
+#line 1481 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_finalize (GObject* obj) {
 	SearchesSidebarEntry * self;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 95 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1484 "Branch.c"
+#line 1493 "Branch.c"
 }
 
 
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index f557baa..1c4ee90 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -72,8 +72,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
     private void setup_context_menu() {
         this.builder = new Gtk.Builder ();
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/search_sidebar_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("search_sidebar_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.context_menu = new Gtk.Menu.from_model (model);
         } catch (Error error) {
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index eea8d74..15a6e82 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -5691,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5684 "SearchBoolean.c"
-				goto __catch76_database_error;
+				goto __catch77_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5707,8 +5707,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5699 "SearchBoolean.c"
 	}
-	goto __finally76;
-	__catch76_database_error:
+	goto __finally77;
+	__catch77_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5724,7 +5724,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5716 "SearchBoolean.c"
 	}
-	__finally76:
+	__finally77:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5835,7 +5835,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5828 "SearchBoolean.c"
-				goto __catch77_database_error;
+				goto __catch78_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,8 +5846,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5837 "SearchBoolean.c"
 		}
 	}
-	goto __finally77;
-	__catch77_database_error:
+	goto __finally78;
+	__catch78_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -5867,7 +5867,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5859 "SearchBoolean.c"
 	}
-	__finally77:
+	__finally78:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6041,7 +6041,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6034 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch79_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6132,8 +6132,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6124 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally79;
+	__catch79_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -6149,7 +6149,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6141 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally79:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6282,7 +6282,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6275 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch80_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6304,8 +6304,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6296 "SearchBoolean.c"
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally80;
+	__catch80_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -6321,7 +6321,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6313 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally80:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6386,7 +6386,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6379 "SearchBoolean.c"
-				goto __catch80_database_error;
+				goto __catch81_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6397,8 +6397,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6388 "SearchBoolean.c"
 		}
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally81;
+	__catch81_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6414,7 +6414,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6406 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally81:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index 6a28a5f..f63fbe0 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -500,6 +500,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -679,14 +680,14 @@ static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_o
 static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
 #line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 683 "Tree.c"
+#line 684 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
 #line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 690 "Tree.c"
+#line 691 "Tree.c"
 }
 
 
@@ -705,28 +706,28 @@ static GType sidebar_tree_columns_get_type (void) {
 static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 709 "Tree.c"
+#line 710 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 716 "Tree.c"
+#line 717 "Tree.c"
 }
 
 
 static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 723 "Tree.c"
+#line 724 "Tree.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 730 "Tree.c"
+#line 731 "Tree.c"
 }
 
 
@@ -735,7 +736,7 @@ static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelec
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
 #line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 739 "Tree.c"
+#line 740 "Tree.c"
 }
 
 
@@ -744,7 +745,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTr
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 748 "Tree.c"
+#line 749 "Tree.c"
 }
 
 
@@ -753,7 +754,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (Gtk
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 757 "Tree.c"
+#line 758 "Tree.c"
 }
 
 
@@ -764,11 +765,11 @@ static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, c
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 768 "Tree.c"
+#line 769 "Tree.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 772 "Tree.c"
+#line 773 "Tree.c"
 }
 
 
@@ -777,21 +778,21 @@ static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (Gt
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 781 "Tree.c"
+#line 782 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 788 "Tree.c"
+#line 789 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
 #line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 795 "Tree.c"
+#line 796 "Tree.c"
 }
 
 
@@ -800,7 +801,7 @@ static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget*
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
 #line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 804 "Tree.c"
+#line 805 "Tree.c"
 }
 
 
@@ -1015,14 +1016,14 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	_g_object_unref0 (text_column);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 1019 "Tree.c"
+#line 1020 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1026 "Tree.c"
+#line 1027 "Tree.c"
 }
 
 
@@ -1058,7 +1059,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 		_g_object_unref0 (wrapper);
 #line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1062 "Tree.c"
+#line 1063 "Tree.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = renderer;
@@ -1070,7 +1071,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 	gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1074 "Tree.c"
+#line 1075 "Tree.c"
 }
 
 
@@ -1081,7 +1082,7 @@ static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx)
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
 #line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1085 "Tree.c"
+#line 1086 "Tree.c"
 }
 
 
@@ -1096,7 +1097,7 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1100 "Tree.c"
+#line 1101 "Tree.c"
 }
 
 
@@ -1112,21 +1113,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1116 "Tree.c"
+#line 1117 "Tree.c"
 		SidebarEntry* _tmp2_ = NULL;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = self->priv->internal_drag_source_entry;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1122 "Tree.c"
+#line 1123 "Tree.c"
 	} else {
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1126 "Tree.c"
+#line 1127 "Tree.c"
 	}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1130 "Tree.c"
+#line 1131 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
 		gint _tmp3_ = 0;
@@ -1150,7 +1151,7 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 		_tmp7_ = path;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp7_ != NULL) {
-#line 1154 "Tree.c"
+#line 1155 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp8_ = NULL;
 			SidebarTreeEntryWrapper* _tmp9_ = NULL;
@@ -1165,7 +1166,7 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 			_tmp10_ = wrapper;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp10_ != NULL) {
-#line 1169 "Tree.c"
+#line 1170 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp11_ = NULL;
 				SidebarEntry* _tmp12_ = NULL;
 				SidebarEntry* _tmp13_ = NULL;
@@ -1179,21 +1180,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1183 "Tree.c"
+#line 1184 "Tree.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1187 "Tree.c"
+#line 1188 "Tree.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1191 "Tree.c"
+#line 1192 "Tree.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1197 "Tree.c"
+#line 1198 "Tree.c"
 }
 
 
@@ -1201,108 +1202,116 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 	GError * _inner_error_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1205 "Tree.c"
+#line 1206 "Tree.c"
 	{
 		GtkBuilder* _tmp0_ = NULL;
+		gchar* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		GObject* _tmp2_ = NULL;
-		GMenuModel* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GtkMenu* _tmp5_ = NULL;
+		GtkBuilder* _tmp3_ = NULL;
+		GObject* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GtkMenu* _tmp7_ = NULL;
 		GSimpleActionGroup* group = NULL;
-		GSimpleActionGroup* _tmp6_ = NULL;
-		GSimpleActionGroup* _tmp7_ = NULL;
 		GSimpleActionGroup* _tmp8_ = NULL;
-		GtkMenu* _tmp9_ = NULL;
+		GSimpleActionGroup* _tmp9_ = NULL;
+		GSimpleActionGroup* _tmp10_ = NULL;
+		GtkMenu* _tmp11_ = NULL;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = self->priv->builder;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_builder_add_from_resource (_tmp0_, "/org/gnome/Shotwell/sidebar_default_context.ui", &_inner_error_);
+		_tmp1_ = resources_get_ui ("sidebar_default_context.ui");
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp2_ = _tmp1_;
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_builder_add_from_resource (_tmp0_, _tmp2_, &_inner_error_);
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_free0 (_tmp2_);
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1225 "Tree.c"
-			goto __catch50_g_error;
+#line 1234 "Tree.c"
+			goto __catch51_g_error;
 		}
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp3_ = self->priv->builder;
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp4_ = gtk_builder_get_object (_tmp3_, "popup-menu");
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp4_) : NULL);
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		model = _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp1_ = self->priv->builder;
+		_tmp6_ = model;
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = gtk_builder_get_object (_tmp1_, "popup-menu");
+		_tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_);
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
+		g_object_ref_sink (_tmp7_);
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		model = _tmp3_;
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = model;
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_object_ref_sink (_tmp5_);
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->default_context_menu);
+#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		self->priv->default_context_menu = _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		self->priv->default_context_menu = _tmp5_;
+		_tmp8_ = g_simple_action_group_new ();
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		group = _tmp8_;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = g_simple_action_group_new ();
+		_tmp9_ = group;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		group = _tmp6_;
+		g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self);
 #line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = group;
+		_tmp10_ = group;
 #line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self);
+		gtk_widget_insert_action_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "sidebar", G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_action_group_get_type (), GActionGroup));
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = group;
+		_tmp11_ = self->priv->default_context_menu;
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_widget_insert_action_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "sidebar", G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_action_group_get_type (), GActionGroup));
-#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = self->priv->default_context_menu;
-#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_attach_to_widget (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+		gtk_menu_attach_to_widget (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (group);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 1266 "Tree.c"
+#line 1275 "Tree.c"
 	}
-	goto __finally50;
-	__catch50_g_error:
+	goto __finally51;
+	__catch51_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		Application* _tmp14_ = NULL;
-		Application* _tmp15_ = NULL;
+		GError* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		gchar* _tmp15_ = NULL;
+		Application* _tmp16_ = NULL;
+		Application* _tmp17_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_error_ = _inner_error_;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_inner_error_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = _error_;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = _tmp10_->message;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = g_strdup_printf ("Error loading UI resource: %s", _tmp11_);
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = _tmp12_;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		app_window_error_message (_tmp13_, NULL);
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp13_);
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = application_get_instance ();
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp12_ = _error_;
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp13_ = _tmp12_->message;
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp14_ = g_strdup_printf ("Error loading UI resource: %s", _tmp13_);
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _tmp14_;
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		application_panic (_tmp15_);
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_application_unref0 (_tmp15_);
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		app_window_error_message (_tmp15_, NULL);
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_free0 (_tmp15_);
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp16_ = application_get_instance ();
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp17_ = _tmp16_;
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		application_panic (_tmp17_);
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_application_unref0 (_tmp17_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (_error_);
-#line 1304 "Tree.c"
+#line 1313 "Tree.c"
 	}
-	__finally50:
+	__finally51:
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1311,7 +1320,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		g_clear_error (&_inner_error_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1315 "Tree.c"
+#line 1324 "Tree.c"
 	}
 }
 
@@ -1321,21 +1330,21 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 	GeeHashMap* _tmp0_ = NULL;
 	SidebarEntry* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1339 "Tree.c"
+#line 1348 "Tree.c"
 }
 
 
@@ -1346,43 +1355,43 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 	SidebarEntry* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = (SidebarTreeEntryWrapper*) _tmp2_;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1366 "Tree.c"
+#line 1375 "Tree.c"
 		SidebarEntry* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = entry;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = sidebar_entry_to_string (_tmp4_);
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_warning ("Tree.vala:222: Entry %s not found in sidebar", _tmp6_);
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_warning ("Tree.vala:221: Entry %s not found in sidebar", _tmp6_);
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 1380 "Tree.c"
+#line 1389 "Tree.c"
 	}
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1386 "Tree.c"
+#line 1395 "Tree.c"
 }
 
 
@@ -1396,64 +1405,64 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	GValue _tmp3_ = {0};
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, NULL);
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = *iter;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_);
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	val = _tmp2_;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = val;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _g_object_ref0 (g_value_get_object (&_tmp3_));
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1424 "Tree.c"
+#line 1433 "Tree.c"
 		GtkTreeStore* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
 		GtkTreePath* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->store;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = *iter;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp8_;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_path_to_string (_tmp9_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = _tmp10_;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:233: No entry found in sidebar at %s", _tmp11_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:232: No entry found in sidebar at %s", _tmp11_);
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp11_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp9_);
-#line 1449 "Tree.c"
+#line 1458 "Tree.c"
 	}
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1457 "Tree.c"
+#line 1466 "Tree.c"
 }
 
 
@@ -1466,49 +1475,49 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	gboolean _tmp3_ = FALSE;
 	GtkTreeIter _tmp7_ = {0};
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp2_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1484 "Tree.c"
+#line 1493 "Tree.c"
 		GtkTreePath* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = path;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = gtk_tree_path_to_string (_tmp4_);
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:241: No entry found in sidebar at %s", _tmp6_);
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:240: No entry found in sidebar at %s", _tmp6_);
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1502 "Tree.c"
+#line 1511 "Tree.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = iter;
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp8_;
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1512 "Tree.c"
+#line 1521 "Tree.c"
 }
 
 
@@ -1530,79 +1539,79 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 	GtkTreePath* _tmp12_ = NULL;
 	SidebarEntry* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1548 "Tree.c"
+#line 1557 "Tree.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1566 "Tree.c"
+#line 1575 "Tree.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp5_, _tmp8_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = mask_signal;
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = _tmp9_;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = wrapper;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_);
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = _tmp11_;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp12_);
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = entry;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_);
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1606 "Tree.c"
+#line 1615 "Tree.c"
 }
 
 
@@ -1617,75 +1626,75 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	GtkTreeSelection* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp6_ = NULL;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp3_;
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = selection;
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1649 "Tree.c"
+#line 1658 "Tree.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ != NULL) {
-#line 1655 "Tree.c"
+#line 1664 "Tree.c"
 		GtkTreeSelection* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		GtkTreePath* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = selection;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp11_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp10_);
-#line 1675 "Tree.c"
+#line 1684 "Tree.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 1679 "Tree.c"
+#line 1688 "Tree.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp5_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1689 "Tree.c"
+#line 1698 "Tree.c"
 }
 
 
@@ -1693,40 +1702,40 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	gboolean result = FALSE;
 	GtkTreeSelection* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp1_ != 0;
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1707 "Tree.c"
+#line 1716 "Tree.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1714 "Tree.c"
+#line 1723 "Tree.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1721 "Tree.c"
+#line 1730 "Tree.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_free (self);
-#line 1730 "Tree.c"
+#line 1739 "Tree.c"
 }
 
 
@@ -1749,96 +1758,96 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GList* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	GtkTreePath* _tmp17_ = NULL;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp1_;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = selection;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1773 "Tree.c"
+#line 1782 "Tree.c"
 	}
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_selection_get_selected_rows (_tmp3_, &_tmp4_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (_tmp4_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp6_;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp5_;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = rows;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = g_list_length (_tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_ == ((guint) 0)) {
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1795 "Tree.c"
+#line 1804 "Tree.c"
 	} else {
 		GList* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = rows;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = g_list_length (_tmp10_);
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1805 "Tree.c"
+#line 1814 "Tree.c"
 	}
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = rows;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = g_list_length (_tmp13_);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_ != ((guint) 0)) {
-#line 1815 "Tree.c"
+#line 1824 "Tree.c"
 		GList* _tmp15_ = NULL;
 		gconstpointer _tmp16_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = rows;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1824 "Tree.c"
+#line 1833 "Tree.c"
 	} else {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = NULL;
-#line 1828 "Tree.c"
+#line 1837 "Tree.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp17_;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1842 "Tree.c"
+#line 1851 "Tree.c"
 }
 
 
@@ -1855,90 +1864,90 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	SidebarEmphasizableEntry* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	SidebarEmphasizableEntry* _tmp8_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = guarded_markup_escape_text (_tmp2_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp2_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	name = _tmp4_;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL);
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable_entry = _tmp6_;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = emphasizable_entry;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ != NULL) {
-#line 1887 "Tree.c"
+#line 1896 "Tree.c"
 		SidebarEmphasizableEntry* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = emphasizable_entry;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp10_;
-#line 1896 "Tree.c"
+#line 1905 "Tree.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = FALSE;
-#line 1900 "Tree.c"
+#line 1909 "Tree.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 1904 "Tree.c"
+#line 1913 "Tree.c"
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = name;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = g_strdup_printf ("<b>%s</b>", _tmp11_);
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		name = _tmp12_;
-#line 1915 "Tree.c"
+#line 1924 "Tree.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable_entry);
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1923 "Tree.c"
+#line 1932 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
 	gboolean result = FALSE;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1933 "Tree.c"
+#line 1942 "Tree.c"
 }
 
 
 gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1942 "Tree.c"
+#line 1951 "Tree.c"
 }
 
 
@@ -1952,41 +1961,41 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_ == NULL) {
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1970 "Tree.c"
+#line 1979 "Tree.c"
 		}
-#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1976 "Tree.c"
+#line 1985 "Tree.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->selected_wrapper;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 1990 "Tree.c"
+#line 1999 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarTreeEntryWrapper* _tmp7_ = NULL;
@@ -1996,168 +2005,168 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		gint _tmp11_ = 0;
 		gboolean _tmp19_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		old_wrapper = _tmp7_;
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = _tmp8_;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = self->priv->editing_disabled;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2014 "Tree.c"
+#line 2023 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp12_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2020 "Tree.c"
+#line 2029 "Tree.c"
 		} else {
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2024 "Tree.c"
+#line 2033 "Tree.c"
 		}
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2028 "Tree.c"
+#line 2037 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = wrapper;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_->entry;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2037 "Tree.c"
+#line 2046 "Tree.c"
 		} else {
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2041 "Tree.c"
+#line 2050 "Tree.c"
 		}
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2045 "Tree.c"
+#line 2054 "Tree.c"
 			GtkCellRendererText* _tmp15_ = NULL;
 			SidebarTreeEntryWrapper* _tmp16_ = NULL;
 			SidebarEntry* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = wrapper;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = _tmp16_->entry;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2060 "Tree.c"
+#line 2069 "Tree.c"
 		}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = wrapper;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp20_ != NULL) {
-#line 2066 "Tree.c"
+#line 2075 "Tree.c"
 			gboolean _tmp21_ = FALSE;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = self->priv->mask_entry_selected_signal;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = !_tmp21_;
-#line 2072 "Tree.c"
+#line 2081 "Tree.c"
 		} else {
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = FALSE;
-#line 2076 "Tree.c"
+#line 2085 "Tree.c"
 		}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_) {
-#line 2080 "Tree.c"
+#line 2089 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
 			SidebarTreeEntryWrapper* _tmp22_ = NULL;
 			SidebarEntry* _tmp23_ = NULL;
 			SidebarSelectableEntry* _tmp24_ = NULL;
 			SidebarSelectableEntry* _tmp25_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = wrapper;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _tmp22_->entry;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL);
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			selectable = _tmp24_;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = selectable;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ != NULL) {
-#line 2098 "Tree.c"
+#line 2107 "Tree.c"
 				gboolean _tmp26_ = FALSE;
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp26_) {
-#line 2104 "Tree.c"
+#line 2113 "Tree.c"
 					SidebarSelectableEntry* _tmp27_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp27_ = selectable;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					g_signal_emit_by_name (self, "entry-selected", _tmp27_);
-#line 2110 "Tree.c"
+#line 2119 "Tree.c"
 				} else {
 					SidebarTreeEntryWrapper* _tmp28_ = NULL;
 					SidebarEntry* _tmp29_ = NULL;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp28_ = old_wrapper;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp29_ = _tmp28_->entry;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2120 "Tree.c"
+#line 2129 "Tree.c"
 				}
 			}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2125 "Tree.c"
+#line 2134 "Tree.c"
 		}
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2129 "Tree.c"
+#line 2138 "Tree.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2135 "Tree.c"
+#line 2144 "Tree.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2141 "Tree.c"
+#line 2150 "Tree.c"
 }
 
 
 void sidebar_tree_disable_editing (SidebarTree* self) {
 	gint _tmp0_ = 0;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->editing_disabled = _tmp0_ + 1;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2155 "Tree.c"
+#line 2164 "Tree.c"
 		GtkCellRendererText* _tmp1_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
-#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2161 "Tree.c"
+#line 2170 "Tree.c"
 	}
 }
 
@@ -2168,141 +2177,141 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GtkTreePath* _tmp3_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2182 "Tree.c"
+#line 2191 "Tree.c"
 		gint _tmp4_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2188 "Tree.c"
+#line 2197 "Tree.c"
 	} else {
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2192 "Tree.c"
+#line 2201 "Tree.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2196 "Tree.c"
+#line 2205 "Tree.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->editing_disabled = _tmp5_ - 1;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2207 "Tree.c"
+#line 2216 "Tree.c"
 	} else {
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2211 "Tree.c"
+#line 2220 "Tree.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2215 "Tree.c"
+#line 2224 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp10_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_path (self, _tmp7_);
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp8_;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = wrapper;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2231 "Tree.c"
+#line 2240 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp11_ = NULL;
 			SidebarEntry* _tmp12_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = wrapper;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _tmp11_->entry;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2240 "Tree.c"
+#line 2249 "Tree.c"
 		} else {
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2244 "Tree.c"
+#line 2253 "Tree.c"
 		}
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2248 "Tree.c"
+#line 2257 "Tree.c"
 			GtkCellRendererText* _tmp13_ = NULL;
 			SidebarTreeEntryWrapper* _tmp14_ = NULL;
 			SidebarEntry* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = wrapper;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp14_->entry;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2263 "Tree.c"
+#line 2272 "Tree.c"
 		}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2267 "Tree.c"
+#line 2276 "Tree.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2271 "Tree.c"
+#line 2280 "Tree.c"
 }
 
 
 void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
 	GtkTreePath* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2290 "Tree.c"
+#line 2299 "Tree.c"
 		GtkTreePath* _tmp2_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = path;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2296 "Tree.c"
+#line 2305 "Tree.c"
 	} else {
 		GtkTreePath* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = path;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = expand_all;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2306 "Tree.c"
+#line 2315 "Tree.c"
 	}
 }
 
@@ -2316,47 +2325,47 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2342 "Tree.c"
+#line 2351 "Tree.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_);
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2360 "Tree.c"
+#line 2369 "Tree.c"
 }
 
 
@@ -2370,37 +2379,37 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreeIter iter = {0};
 	GtkTreePath* _tmp13_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2394 "Tree.c"
+#line 2403 "Tree.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2404 "Tree.c"
+#line 2413 "Tree.c"
 		GtkTreeStore* _tmp5_ = NULL;
 		GtkTreePath* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -2409,89 +2418,89 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		GtkTreeIter _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
 		GtkTreePath* _tmp12_ = NULL;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->store;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = path;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_);
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		iter = _tmp7_;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp8_) {
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2425 "Tree.c"
+#line 2434 "Tree.c"
 		}
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = self->priv->store;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_);
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp11_) {
-#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2437 "Tree.c"
+#line 2446 "Tree.c"
 		}
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_path_down (_tmp12_);
-#line 2443 "Tree.c"
+#line 2452 "Tree.c"
 	}
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = path;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2453 "Tree.c"
+#line 2462 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2460 "Tree.c"
+#line 2469 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2467 "Tree.c"
+#line 2476 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2474 "Tree.c"
+#line 2483 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2481 "Tree.c"
+#line 2490 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2488 "Tree.c"
+#line 2497 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2495 "Tree.c"
+#line 2504 "Tree.c"
 }
 
 
@@ -2512,139 +2521,139 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 	SidebarBranch* _tmp24_ = NULL;
 	SidebarBranch* _tmp25_ = NULL;
 	SidebarBranch* _tmp26_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = position;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_return_if_fail (_tmp0_ >= 0, "position >= 0");
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->branches;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = branch;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp3_, "!branches.has_key(branch)");
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->branches;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = branch;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = position;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_));
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_) {
-#line 2546 "Tree.c"
+#line 2555 "Tree.c"
 		SidebarBranch* _tmp9_ = NULL;
 		SidebarBranch* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		SidebarBranch* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = branch;
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp9_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = branch;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_) {
-#line 2562 "Tree.c"
+#line 2571 "Tree.c"
 			SidebarBranch* _tmp12_ = NULL;
 			SidebarEntry* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = branch;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = sidebar_branch_get_root (_tmp12_);
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_first_child (self, _tmp14_);
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2576 "Tree.c"
+#line 2585 "Tree.c"
 		}
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = branch;
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp16_) {
-#line 2584 "Tree.c"
+#line 2593 "Tree.c"
 			SidebarBranch* _tmp17_ = NULL;
 			SidebarEntry* _tmp18_ = NULL;
 			SidebarEntry* _tmp19_ = NULL;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = branch;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_branch_get_root (_tmp17_);
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_entry (self, _tmp19_);
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp19_);
-#line 2598 "Tree.c"
+#line 2607 "Tree.c"
 		}
 	}
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = branch;
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = branch;
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0);
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = branch;
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-added", _tmp26_);
-#line 2629 "Tree.c"
+#line 2638 "Tree.c"
 }
 
 
 static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	GtkTreeIter* dup;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	dup = g_new0 (GtkTreeIter, 1);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	memcpy (dup, self, sizeof (GtkTreeIter));
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2641 "Tree.c"
+#line 2650 "Tree.c"
 }
 
 
 static gpointer __gtk_tree_iter_dup0 (gpointer self) {
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2648 "Tree.c"
+#line 2657 "Tree.c"
 }
 
 
@@ -2683,39 +2692,39 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	SidebarEntry* _tmp46_ = NULL;
 	GtkTreeIter* _tmp47_ = NULL;
 	GtkTreeIter _tmp48_ = {0};
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->branches;
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	position = (gint) ((gintptr) _tmp5_);
-#line 427 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 426 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	insertion_iter = NULL;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp7_;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp8_;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2719 "Tree.c"
+#line 2728 "Tree.c"
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
 		GtkTreeIter _tmp10_ = {0};
@@ -2727,154 +2736,154 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		gint _tmp16_ = 0;
 		GtkTreeStore* _tmp22_ = NULL;
 		gboolean _tmp23_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = found;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp9_) {
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2737 "Tree.c"
+#line 2746 "Tree.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_);
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp12_ == NULL) {
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp11_);
-#line 2749 "Tree.c"
+#line 2758 "Tree.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		root_wrapper = _tmp12_;
-#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = root_wrapper;
-#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp13_ != NULL, "root_wrapper != null");
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = position;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = root_wrapper;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _tmp15_->root_position;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ < _tmp16_) {
-#line 2765 "Tree.c"
+#line 2774 "Tree.c"
 			GtkTreeStore* _tmp17_ = NULL;
 			GtkTreeIter _tmp18_ = {0};
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeIter _tmp20_ = {0};
 			GtkTreeIter* _tmp21_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = self->priv->store;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = iter;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_free0 (insertion_iter);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _tmp19_;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			insertion_iter = _tmp21_;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (root_wrapper);
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2789 "Tree.c"
+#line 2798 "Tree.c"
 		}
-#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->store;
-#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter);
-#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp23_;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2799 "Tree.c"
+#line 2808 "Tree.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = insertion_iter;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ == NULL) {
-#line 2805 "Tree.c"
+#line 2814 "Tree.c"
 		GtkTreeStore* _tmp25_ = NULL;
 		GtkTreeIter _tmp26_ = {0};
 		GtkTreeIter _tmp27_ = {0};
 		GtkTreeIter* _tmp28_ = NULL;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = self->priv->store;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp25_, &_tmp26_, NULL);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (insertion_iter);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = _tmp26_;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp28_;
-#line 2822 "Tree.c"
+#line 2831 "Tree.c"
 	}
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = insertion_iter;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->store;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = branch;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = sidebar_branch_get_root (_tmp31_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = self->priv->store;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = insertion_iter;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = *_tmp35_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = _tmp37_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = position;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _tmp40_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = *_tmp29_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper));
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp41_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp38_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp33_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp43_ = branch;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp44_ = branch;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp45_ = sidebar_branch_get_root (_tmp44_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp46_ = _tmp45_;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = insertion_iter;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = *_tmp47_;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp46_);
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 2878 "Tree.c"
+#line 2887 "Tree.c"
 }
 
 
@@ -2884,31 +2893,31 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (parent));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (parent_iter != NULL);
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = parent;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2912 "Tree.c"
+#line 2921 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -2919,25 +2928,25 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 2941 "Tree.c"
+#line 2950 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -2954,61 +2963,61 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			SidebarBranch* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
 			GtkTreeIter _tmp22_ = {0};
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 2970 "Tree.c"
+#line 2979 "Tree.c"
 			}
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->store;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = *parent_iter;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_);
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			append_iter = _tmp17_;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = append_iter;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = child;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_);
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = branch;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = child;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = append_iter;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3004 "Tree.c"
+#line 3013 "Tree.c"
 		}
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3008 "Tree.c"
+#line 3017 "Tree.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3012 "Tree.c"
+#line 3021 "Tree.c"
 }
 
 
@@ -3022,79 +3031,79 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 	GtkTreePath* _tmp6_ = NULL;
 	SidebarTreeEntryWrapper* _tmp7_ = NULL;
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *assoc_iter;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->store;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = *assoc_iter;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp8_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp6_);
-#line 3056 "Tree.c"
+#line 3065 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3063 "Tree.c"
+#line 3072 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3070 "Tree.c"
+#line 3079 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3077 "Tree.c"
+#line 3086 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3084 "Tree.c"
+#line 3093 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3091 "Tree.c"
+#line 3100 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3098 "Tree.c"
+#line 3107 "Tree.c"
 }
 
 
@@ -3140,162 +3149,162 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	SidebarRenameableEntry* _tmp37_ = NULL;
 	SidebarRenameableEntry* _tmp38_ = NULL;
 	SidebarEntry* _tmp40_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp5_, "!entry_map.has_key(entry)");
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->entry_map;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = entry;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = self->priv->store;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = *assoc_iter;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = entry;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = _tmp12_;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp13_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = self->priv->store;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = *assoc_iter;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = entry;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = _tmp17_;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = guarded_markup_escape_text (_tmp18_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp18_);
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->store;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = *assoc_iter;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = wrapper;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1);
-#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *assoc_iter;
-#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp24_);
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = entry;
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = entry;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp28_;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = pageable;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_ != NULL) {
-#line 3238 "Tree.c"
+#line 3247 "Tree.c"
 		SidebarPageRepresentative* _tmp30_ = NULL;
 		SidebarPageRepresentative* _tmp31_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = pageable;
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp31_ = pageable;
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3249 "Tree.c"
+#line 3258 "Tree.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = entry;
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL);
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp33_;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = emphasizable;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp34_ != NULL) {
-#line 3261 "Tree.c"
+#line 3270 "Tree.c"
 		SidebarEmphasizableEntry* _tmp35_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = emphasizable;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3267 "Tree.c"
+#line 3276 "Tree.c"
 	}
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL);
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp37_;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = renameable;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp38_ != NULL) {
-#line 3279 "Tree.c"
+#line 3288 "Tree.c"
 		SidebarRenameableEntry* _tmp39_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp39_ = renameable;
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3285 "Tree.c"
+#line 3294 "Tree.c"
 	}
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_grafted (_tmp40_, self);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3299 "Tree.c"
+#line 3308 "Tree.c"
 }
 
 
@@ -3330,97 +3339,97 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 	GtkTreeStore* _tmp23_ = NULL;
 	GtkTreeIter _tmp24_ = {0};
 	GtkTreeIter _tmp25_ = {0};
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (new_iter != NULL, NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL);
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = current_wrapper;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp4_;
-#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = self->priv->store;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *new_iter;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_);
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = _tmp10_;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp9_);
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp11_;
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = self->priv->entry_map;
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = *new_iter;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_name_for_entry (self, entry);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _tmp15_;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp16_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = self->priv->store;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = *new_iter;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_entry_get_sidebar_tooltip (entry);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = guarded_markup_escape_text (_tmp20_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = _tmp21_;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp22_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = self->priv->store;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *new_iter;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
-#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = *new_iter;
-#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp25_);
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = new_wrapper;
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3424 "Tree.c"
+#line 3433 "Tree.c"
 }
 
 
@@ -3450,91 +3459,91 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 	SidebarBranch* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
 	SidebarBranch* _tmp24_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_branch_get_root (_tmp3_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = _tmp6_;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 3480 "Tree.c"
+#line 3489 "Tree.c"
 		SidebarBranch* _tmp8_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = branch;
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3486 "Tree.c"
+#line 3495 "Tree.c"
 	}
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = branch;
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE);
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self);
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = branch;
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = branch;
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self);
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = branch;
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE);
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = branch;
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self);
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = branch;
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE);
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self);
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->branches;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL);
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp23_;
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-removed", _tmp24_);
-#line 3538 "Tree.c"
+#line 3547 "Tree.c"
 }
 
 
@@ -3546,39 +3555,39 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeRootWrapper* _tmp4_ = NULL;
 	SidebarTreeRootWrapper* _tmp5_ = NULL;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_branch_get_root (_tmp0_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3568 "Tree.c"
+#line 3577 "Tree.c"
 	}
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp2_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	root_wrapper = _tmp5_;
-#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (root_wrapper != NULL, "root_wrapper != null");
-#line 547 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 546 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3582 "Tree.c"
+#line 3591 "Tree.c"
 }
 
 
@@ -3590,54 +3599,54 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_is_selected (self, _tmp1_);
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp2_;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = only_children;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_);
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = selected;
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 3616 "Tree.c"
+#line 3625 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarSelectableEntry* _tmp8_ = NULL;
 		SidebarSelectableEntry* _tmp9_ = NULL;
 		SidebarSelectableEntry* _tmp10_ = NULL;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL);
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp8_;
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selectable;
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "selectable != null");
-#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = selectable;
-#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "selected-entry-removed", _tmp10_);
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3641 "Tree.c"
+#line 3650 "Tree.c"
 	}
 }
 
@@ -3685,29 +3694,29 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	SidebarEntry* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
 	gboolean _tmp60_ = FALSE;
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp4_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3711 "Tree.c"
+#line 3720 "Tree.c"
 		gboolean _tmp6_ = FALSE;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -3717,39 +3726,39 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeStore* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = found;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp6_) {
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3727 "Tree.c"
+#line 3736 "Tree.c"
 		}
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = child_iter;
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		child_wrapper = _tmp8_;
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = child_wrapper;
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "child_wrapper != null");
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = children;
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = child_wrapper;
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = self->priv->store;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp13_;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3753 "Tree.c"
+#line 3762 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
@@ -3760,25 +3769,25 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
 		gint _child_wrapper_index = 0;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = children;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_list = _tmp15_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _child_wrapper_list;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = _tmp17_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_size = _tmp18_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_index = -1;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3782 "Tree.c"
+#line 3791 "Tree.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _tmp21_ = 0;
@@ -3787,188 +3796,188 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			gint _tmp23_ = 0;
 			gpointer _tmp24_ = NULL;
 			SidebarTreeEntryWrapper* _tmp25_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_wrapper_index = _tmp19_ + 1;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _child_wrapper_size;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp20_ < _tmp21_)) {
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3803 "Tree.c"
+#line 3812 "Tree.c"
 			}
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = _child_wrapper_list;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_;
-#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = child_wrapper;
-#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
 #line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 3819 "Tree.c"
+#line 3828 "Tree.c"
 		}
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3823 "Tree.c"
+#line 3832 "Tree.c"
 	}
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = only_children;
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp26_) {
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3833 "Tree.c"
+#line 3842 "Tree.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_);
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp28_;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = self->priv->store;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp29_, &iter);
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->selected_wrapper;
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = wrapper;
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp30_ == _tmp31_) {
-#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3853 "Tree.c"
+#line 3862 "Tree.c"
 	}
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = wrapper;
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_->entry;
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp34_;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = entry;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_pruned (_tmp35_, self);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self);
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = entry;
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self);
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL);
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp41_;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = pageable;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp42_ != NULL) {
-#line 3889 "Tree.c"
+#line 3898 "Tree.c"
 		SidebarPageRepresentative* _tmp43_ = NULL;
 		guint _tmp44_ = 0U;
 		SidebarPageRepresentative* _tmp45_ = NULL;
 		guint _tmp46_ = 0U;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = pageable;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE);
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self);
-#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = pageable;
-#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
-#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 3906 "Tree.c"
+#line 3915 "Tree.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = entry;
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL);
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp48_;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp49_ = renameable;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp49_ != NULL) {
-#line 3918 "Tree.c"
+#line 3927 "Tree.c"
 		SidebarRenameableEntry* _tmp50_ = NULL;
 		guint _tmp51_ = 0U;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = renameable;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 3927 "Tree.c"
+#line 3936 "Tree.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp52_ = entry;
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL);
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp53_;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp54_ = emphasizable;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp54_ != NULL) {
-#line 3939 "Tree.c"
+#line 3948 "Tree.c"
 		SidebarEmphasizableEntry* _tmp55_ = NULL;
 		guint _tmp56_ = 0U;
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp55_ = emphasizable;
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 3948 "Tree.c"
+#line 3957 "Tree.c"
 	}
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = self->priv->entry_map;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = entry;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL);
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp59_;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp60_ = removed;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp60_, "removed");
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3972 "Tree.c"
+#line 3981 "Tree.c"
 }
 
 
@@ -3995,47 +4004,47 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp27_ = {0};
 	SidebarBranch* _tmp28_ = NULL;
 	gboolean _tmp29_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_);
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp2_;
-#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = parent;
-#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp3_ != NULL, "parent != null");
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = parent;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_);
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp5_;
-#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = parent_wrapper;
-#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp6_ != NULL, "parent_wrapper != null");
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = entry;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_);
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	next = _tmp9_;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = next;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 4039 "Tree.c"
+#line 4048 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
 		SidebarEntry* _tmp11_ = NULL;
 		SidebarTreeEntryWrapper* _tmp12_ = NULL;
@@ -4045,81 +4054,81 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp16_ = NULL;
 		GtkTreeIter _tmp17_ = {0};
 		GtkTreeIter _tmp18_ = {0};
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = next;
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_);
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		next_wrapper = _tmp12_;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->store;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = parent_wrapper;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = next_wrapper;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp18_;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4071 "Tree.c"
+#line 4080 "Tree.c"
 	} else {
 		GtkTreeStore* _tmp19_ = NULL;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
 		GtkTreeIter _tmp21_ = {0};
 		GtkTreeIter _tmp22_ = {0};
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = self->priv->store;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = parent_wrapper;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp22_;
-#line 4087 "Tree.c"
+#line 4096 "Tree.c"
 	}
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = insertion_iter;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = entry;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = insertion_iter;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_);
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = branch;
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_) {
-#line 4109 "Tree.c"
+#line 4118 "Tree.c"
 		SidebarEntry* _tmp30_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = entry;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4115 "Tree.c"
+#line 4124 "Tree.c"
 	}
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4123 "Tree.c"
+#line 4132 "Tree.c"
 }
 
 
@@ -4127,27 +4136,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	SidebarEntry* _tmp0_ = NULL;
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (wrapper, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 647 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4151 "Tree.c"
+#line 4160 "Tree.c"
 }
 
 
@@ -4168,41 +4177,41 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp15_ = {0};
 	GtkTreeStore* _tmp16_ = NULL;
 	GtkTreeIter* _tmp17_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_);
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp6_;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = prev;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ != NULL) {
-#line 4206 "Tree.c"
+#line 4215 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp8_ = NULL;
 		SidebarTreeEntryWrapper* _tmp9_ = NULL;
@@ -4210,49 +4219,49 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeIter _tmp12_ = {0};
 		GtkTreeIter* _tmp13_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = prev;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_);
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp9_;
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = prev_wrapper;
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp10_ != NULL, "prev_wrapper != null");
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = prev_wrapper;
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp13_;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4236 "Tree.c"
+#line 4245 "Tree.c"
 	}
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = wrapper;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry_iter = _tmp15_;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = self->priv->store;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = prev_iter;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4256 "Tree.c"
+#line 4265 "Tree.c"
 }
 
 
@@ -4300,95 +4309,95 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	SidebarTreeEntryWrapper* _tmp37_ = NULL;
 	SidebarTreeEntryWrapper* _tmp38_ = NULL;
 	gboolean _tmp39_ = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent));
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_get_current_path (self);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = _tmp9_ == 0;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp10_;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = wrapper;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp12_;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp13_, &iter);
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = branch;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = entry;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_);
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp16_;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = parent;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp17_ != NULL, "parent != null");
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = parent;
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_);
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp19_;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = parent_wrapper;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp20_ != NULL, "parent_wrapper != null");
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = entry;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_);
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp23_;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = prev;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ != NULL) {
-#line 4392 "Tree.c"
+#line 4401 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp25_ = NULL;
 		SidebarTreeEntryWrapper* _tmp26_ = NULL;
@@ -4396,86 +4405,86 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		SidebarTreeEntryWrapper* _tmp28_ = NULL;
 		GtkTreeIter _tmp29_ = {0};
 		GtkTreeIter* _tmp30_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = prev;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_);
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp26_;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = prev_wrapper;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp27_ != NULL, "prev_wrapper != null");
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = prev_wrapper;
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp30_;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4422 "Tree.c"
+#line 4431 "Tree.c"
 	}
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = self->priv->store;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = parent_wrapper;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_);
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = prev_iter;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_);
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_iter = _tmp35_;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = new_iter;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = wrapper;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_);
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp38_;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = selected;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp39_) {
-#line 4448 "Tree.c"
+#line 4457 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp40_ = NULL;
 		SidebarEntry* _tmp41_ = NULL;
 		SidebarTreeEntryWrapper* _tmp42_ = NULL;
 		SidebarEntry* _tmp43_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp40_ = new_wrapper;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = _tmp40_->entry;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp41_);
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = new_wrapper;
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = _tmp42_->entry;
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4465 "Tree.c"
+#line 4474 "Tree.c"
 	}
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4479 "Tree.c"
+#line 4488 "Tree.c"
 }
 
 
@@ -4485,29 +4494,29 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4511 "Tree.c"
+#line 4520 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -4518,25 +4527,25 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4540 "Tree.c"
+#line 4549 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -4552,61 +4561,61 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			SidebarTreeEntryWrapper* _tmp18_ = NULL;
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeStore* _tmp20_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4568 "Tree.c"
+#line 4577 "Tree.c"
 			}
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = child;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_);
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = _tmp16_;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = child_wrapper;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_vala_assert (_tmp17_ != NULL, "child_wrapper != null");
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = child_wrapper;
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_);
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_iter = _tmp19_;
-#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = self->priv->store;
-#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_move_before (_tmp20_, &child_iter, NULL);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4602 "Tree.c"
+#line 4611 "Tree.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4606 "Tree.c"
+#line 4615 "Tree.c"
 	}
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4610 "Tree.c"
+#line 4619 "Tree.c"
 }
 
 
@@ -4614,36 +4623,36 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
 	gboolean _tmp0_ = FALSE;
 	SidebarBranch* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = shown;
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 4626 "Tree.c"
+#line 4635 "Tree.c"
 		SidebarBranch* _tmp1_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = branch;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4632 "Tree.c"
+#line 4641 "Tree.c"
 	} else {
 		SidebarBranch* _tmp2_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = branch;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4639 "Tree.c"
+#line 4648 "Tree.c"
 	}
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = shown;
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-shown", _tmp3_, _tmp4_);
-#line 4647 "Tree.c"
+#line 4656 "Tree.c"
 }
 
 
@@ -4656,35 +4665,35 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = tooltip;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4688 "Tree.c"
+#line 4697 "Tree.c"
 }
 
 
@@ -4695,29 +4704,29 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 	GtkTreeStore* _tmp2_ = NULL;
 	GtkTreeIter _tmp3_ = {0};
 	const gchar* _tmp4_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 742 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = icon;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4721 "Tree.c"
+#line 4730 "Tree.c"
 }
 
 
@@ -4730,103 +4739,103 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarEntry* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4762 "Tree.c"
+#line 4771 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
 	SidebarEntry* _tmp0_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (name != NULL);
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4778 "Tree.c"
+#line 4787 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "page-created", _tmp0_, _tmp1_);
-#line 4797 "Tree.c"
+#line 4806 "Tree.c"
 }
 
 
 static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
 	SidebarEmphasizableEntry* _tmp0_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry));
-#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4811 "Tree.c"
+#line 4820 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "destroying-page", _tmp0_, _tmp1_);
-#line 4830 "Tree.c"
+#line 4839 "Tree.c"
 }
 
 
@@ -4842,47 +4851,47 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	GtkTreeStore* _tmp6_ = NULL;
 	GtkTreeIter _tmp7_ = {0};
 	const gchar* _tmp8_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4864 "Tree.c"
+#line 4873 "Tree.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_);
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	icon = _tmp5_;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *iter;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = icon;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (icon);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4886 "Tree.c"
+#line 4895 "Tree.c"
 }
 
 
@@ -4893,56 +4902,56 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 	GtkTreeIter _tmp2_ = {0};
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp0_);
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = *iter;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_);
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp3_;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 4915 "Tree.c"
+#line 4924 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 4922 "Tree.c"
+#line 4931 "Tree.c"
 				GtkTreeIter _tmp8_ = {0};
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 4926 "Tree.c"
+#line 4935 "Tree.c"
 					GtkTreeStore* _tmp6_ = NULL;
 					gboolean _tmp7_ = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					if (!_tmp7_) {
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 4937 "Tree.c"
+#line 4946 "Tree.c"
 					}
 				}
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp5_ = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp8_ = child_iter;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 4946 "Tree.c"
+#line 4955 "Tree.c"
 			}
 		}
 	}
@@ -4956,46 +4965,46 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 4978 "Tree.c"
+#line 4987 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp4_ = NULL;
 		SidebarEntry* _tmp5_ = NULL;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = wrapper;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->entry;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 4987 "Tree.c"
+#line 4996 "Tree.c"
 	} else {
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 4991 "Tree.c"
+#line 5000 "Tree.c"
 	}
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 4999 "Tree.c"
+#line 5008 "Tree.c"
 }
 
 
@@ -5023,65 +5032,65 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	GtkTreePath* _tmp16_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, NULL);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->window;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_display_get_default ();
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gdk_display_get_device_manager (_tmp2_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	x = _tmp5_;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	y = _tmp6_;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	mask = _tmp7_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = x;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = y;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp11_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_x = _tmp12_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_y = _tmp13_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_) {
-#line 5065 "Tree.c"
+#line 5074 "Tree.c"
 		GtkTreePath* _tmp15_ = NULL;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = path;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp15_;
-#line 5071 "Tree.c"
+#line 5080 "Tree.c"
 	} else {
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = NULL;
-#line 5075 "Tree.c"
+#line 5084 "Tree.c"
 	}
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5085 "Tree.c"
+#line 5094 "Tree.c"
 }
 
 
@@ -5100,74 +5109,74 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GList* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkTreePath* _tmp14_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp0_, &_tmp1_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp3_;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp2_;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = rows;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = g_list_length (_tmp5_);
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5126 "Tree.c"
+#line 5135 "Tree.c"
 	} else {
 		GList* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = rows;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_list_length (_tmp7_);
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5136 "Tree.c"
+#line 5145 "Tree.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = rows;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp11_ != ((guint) 0)) {
-#line 5146 "Tree.c"
+#line 5155 "Tree.c"
 		GList* _tmp12_ = NULL;
 		gconstpointer _tmp13_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = rows;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5155 "Tree.c"
+#line 5164 "Tree.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = NULL;
-#line 5159 "Tree.c"
+#line 5168 "Tree.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5171 "Tree.c"
+#line 5180 "Tree.c"
 }
 
 
@@ -5185,65 +5194,65 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	GtkTreePath* _tmp7_ = NULL;
 	GtkTreePath* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_get_selected_rows (_tmp0_, NULL);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp1_;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = rows;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5207 "Tree.c"
+#line 5216 "Tree.c"
 	}
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->data;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp5_;
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5229 "Tree.c"
+#line 5238 "Tree.c"
 	}
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp7_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = path;
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp9_;
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5247 "Tree.c"
+#line 5256 "Tree.c"
 }
 
 
@@ -5271,157 +5280,157 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	GtkMenu* _tmp16_ = NULL;
 	GtkWidget* _tmp17_ = NULL;
 	GdkEventButton* _tmp19_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5295 "Tree.c"
+#line 5304 "Tree.c"
 	}
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL);
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	contextable = _tmp5_;
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = contextable;
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5317 "Tree.c"
+#line 5326 "Tree.c"
 	}
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->entry;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL);
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selectable = _tmp9_;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = selectable;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5331 "Tree.c"
+#line 5340 "Tree.c"
 		SidebarSelectableEntry* _tmp11_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5337 "Tree.c"
+#line 5346 "Tree.c"
 	}
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = event;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_);
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	context_menu = _tmp14_;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context_menu;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp15_ == NULL) {
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (context_menu);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5363 "Tree.c"
+#line 5372 "Tree.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context_menu;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 5371 "Tree.c"
+#line 5380 "Tree.c"
 		GtkMenu* _tmp18_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = context_menu;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 5377 "Tree.c"
+#line 5386 "Tree.c"
 	}
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = event;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp19_ != NULL) {
-#line 5383 "Tree.c"
+#line 5392 "Tree.c"
 		GtkMenu* _tmp20_ = NULL;
 		GdkEventButton* _tmp21_ = NULL;
 		guint _tmp22_ = 0U;
 		GdkEventButton* _tmp23_ = NULL;
 		guint32 _tmp24_ = 0U;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = context_menu;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp21_ = event;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = _tmp21_->button;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = event;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = _tmp23_->time;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5401 "Tree.c"
+#line 5410 "Tree.c"
 	} else {
 		GtkMenu* _tmp25_ = NULL;
 		guint32 _tmp26_ = 0U;
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = context_menu;
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = gtk_get_current_event_time ();
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5411 "Tree.c"
+#line 5420 "Tree.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (context_menu);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selectable);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (contextable);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5425 "Tree.c"
+#line 5434 "Tree.c"
 }
 
 
@@ -5432,27 +5441,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	guint _tmp2_ = 0U;
 	GdkEventButton* _tmp3_ = NULL;
 	guint32 _tmp4_ = 0U;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = event;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_->button;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = event;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->time;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
-#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5456 "Tree.c"
+#line 5465 "Tree.c"
 }
 
 
@@ -5469,129 +5478,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	GtkTreePath* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5495 "Tree.c"
+#line 5504 "Tree.c"
 	}
-#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
-#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	should_allow_toggle = _tmp3_;
-#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5509 "Tree.c"
+#line 5518 "Tree.c"
 		GtkTreeStore* _tmp8_ = NULL;
 		GtkTreeIter _tmp9_ = {0};
 		gboolean _tmp10_ = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = *iter;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_);
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5521 "Tree.c"
+#line 5530 "Tree.c"
 	} else {
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5525 "Tree.c"
+#line 5534 "Tree.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5529 "Tree.c"
+#line 5538 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		SidebarEntry* _tmp12_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5538 "Tree.c"
+#line 5547 "Tree.c"
 	} else {
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5542 "Tree.c"
+#line 5551 "Tree.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5546 "Tree.c"
+#line 5555 "Tree.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = _tmp13_ + 1;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = self->priv->expander_special_count;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ == 1) {
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5563 "Tree.c"
+#line 5572 "Tree.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5570 "Tree.c"
+#line 5579 "Tree.c"
 		}
 	} else {
-#line 891 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5575 "Tree.c"
+#line 5584 "Tree.c"
 	}
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp16_) {
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5587 "Tree.c"
+#line 5596 "Tree.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5595 "Tree.c"
+#line 5604 "Tree.c"
 }
 
 
@@ -5608,120 +5617,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	guint _tmp8_ = 0U;
 	GdkEventButton* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp1_;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5626 "Tree.c"
+#line 5635 "Tree.c"
 		GdkEventButton* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5635 "Tree.c"
+#line 5644 "Tree.c"
 	} else {
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5639 "Tree.c"
+#line 5648 "Tree.c"
 	}
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5649 "Tree.c"
+#line 5658 "Tree.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->button;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5657 "Tree.c"
+#line 5666 "Tree.c"
 		GdkEventButton* _tmp9_ = NULL;
 		GdkEventType _tmp10_ = 0;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5666 "Tree.c"
+#line 5675 "Tree.c"
 	} else {
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5670 "Tree.c"
+#line 5679 "Tree.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5674 "Tree.c"
+#line 5683 "Tree.c"
 		GtkTreePath* _tmp11_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5680 "Tree.c"
+#line 5689 "Tree.c"
 			GtkTreePath* _tmp12_ = NULL;
 			GdkEventButton* _tmp13_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5689 "Tree.c"
+#line 5698 "Tree.c"
 		} else {
 			GdkEventButton* _tmp14_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5696 "Tree.c"
+#line 5705 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
 		GdkEventButton* _tmp16_ = NULL;
 		guint _tmp17_ = 0U;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5708 "Tree.c"
+#line 5717 "Tree.c"
 			GdkEventButton* _tmp18_ = NULL;
 			GdkEventType _tmp19_ = 0;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5717 "Tree.c"
+#line 5726 "Tree.c"
 		} else {
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5721 "Tree.c"
+#line 5730 "Tree.c"
 		}
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5725 "Tree.c"
+#line 5734 "Tree.c"
 			GtkTreePath* _tmp20_ = NULL;
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp23_ = NULL;
@@ -5739,226 +5748,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			GtkTreeStore* _tmp55_ = NULL;
 			GtkTreePath* _tmp56_ = NULL;
 			GtkTreeRowReference* _tmp57_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5747 "Tree.c"
+#line 5756 "Tree.c"
 				GdkEventButton* _tmp21_ = NULL;
 				gboolean _tmp22_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp21_ = event;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp22_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_);
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp22_;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5764 "Tree.c"
+#line 5773 "Tree.c"
 			}
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp24_;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = wrapper;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5776 "Tree.c"
+#line 5785 "Tree.c"
 				GdkEventButton* _tmp26_ = NULL;
 				gboolean _tmp27_ = FALSE;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = event;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp27_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_);
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp27_;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5795 "Tree.c"
+#line 5804 "Tree.c"
 			}
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp30_ = _tmp29_->entry;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5805 "Tree.c"
+#line 5814 "Tree.c"
 			} else {
 				SidebarTreeEntryWrapper* _tmp31_ = NULL;
 				SidebarEntry* _tmp32_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5815 "Tree.c"
+#line 5824 "Tree.c"
 			}
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5819 "Tree.c"
+#line 5828 "Tree.c"
 				GtkTreePath* _tmp33_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5825 "Tree.c"
+#line 5834 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5831 "Tree.c"
+#line 5840 "Tree.c"
 				const GtkTreeRowReference* _tmp37_ = NULL;
 				GtkTreePath* _tmp38_ = NULL;
 				GtkTreePath* _tmp39_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp39_ = _tmp38_;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = _tmp39_ != NULL;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5845 "Tree.c"
+#line 5854 "Tree.c"
 			} else {
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5849 "Tree.c"
+#line 5858 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5853 "Tree.c"
+#line 5862 "Tree.c"
 				const GtkTreeRowReference* _tmp40_ = NULL;
 				GtkTreePath* _tmp41_ = NULL;
 				GtkTreePath* _tmp42_ = NULL;
 				GtkTreePath* _tmp43_ = NULL;
 				gint _tmp44_ = 0;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp42_ = _tmp41_;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp43_ = path;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = _tmp44_ == 0;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5873 "Tree.c"
+#line 5882 "Tree.c"
 			} else {
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5877 "Tree.c"
+#line 5886 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5881 "Tree.c"
+#line 5890 "Tree.c"
 				GtkCellRendererText* _tmp45_ = NULL;
 				GdkEventButton* _tmp46_ = NULL;
 				gboolean _tmp47_ = FALSE;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp46_ = event;
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp47_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp46_);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp47_;
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5901 "Tree.c"
+#line 5910 "Tree.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp50_ = _tmp49_->entry;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5909 "Tree.c"
+#line 5918 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp51_ = NULL;
 				SidebarEntry* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp52_ = _tmp51_->entry;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 5921 "Tree.c"
+#line 5930 "Tree.c"
 			} else {
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 5925 "Tree.c"
+#line 5934 "Tree.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 5929 "Tree.c"
+#line 5938 "Tree.c"
 				GtkCellRendererText* _tmp54_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
-#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5935 "Tree.c"
+#line 5944 "Tree.c"
 			}
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = path;
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp57_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp56_);
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			self->priv->old_path_ref = _tmp57_;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 5949 "Tree.c"
+#line 5958 "Tree.c"
 		}
 	}
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = event;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp58_);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp59_;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5962 "Tree.c"
+#line 5971 "Tree.c"
 }
 
 
@@ -5969,53 +5978,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label3 = 0;
 #line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	static GQuark _tmp4_label3 = 0;
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 5999 "Tree.c"
+#line 6008 "Tree.c"
 			default:
 			{
-#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6006 "Tree.c"
+#line 6015 "Tree.c"
 			}
 		}
 	} else {
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6012 "Tree.c"
+#line 6021 "Tree.c"
 			default:
 			{
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6019 "Tree.c"
+#line 6028 "Tree.c"
 			}
 		}
 	}
@@ -6030,134 +6039,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6042 "Tree.c"
+#line 6051 "Tree.c"
 	GdkEventKey* _tmp15_ = NULL;
 	gboolean _tmp16_ = FALSE;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6063 "Tree.c"
+#line 6072 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp6_ = NULL;
 				GtkTreePath* _tmp7_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp6_;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp7_ = path;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6077 "Tree.c"
+#line 6086 "Tree.c"
 					GtkTreePath* _tmp8_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6083 "Tree.c"
+#line 6092 "Tree.c"
 				}
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6091 "Tree.c"
+#line 6100 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6097 "Tree.c"
+#line 6106 "Tree.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6107 "Tree.c"
+#line 6116 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6113 "Tree.c"
+#line 6122 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
 				GtkTreePath* _tmp12_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp10_;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = path;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6128 "Tree.c"
+#line 6137 "Tree.c"
 					GtkTreePath* _tmp13_ = NULL;
 					gboolean _tmp14_ = FALSE;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6137 "Tree.c"
+#line 6146 "Tree.c"
 				} else {
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6141 "Tree.c"
+#line 6150 "Tree.c"
 				}
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6149 "Tree.c"
+#line 6158 "Tree.c"
 			}
 		}
 	}
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = event;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_);
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6161 "Tree.c"
+#line 6170 "Tree.c"
 }
 
 
@@ -6168,41 +6177,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	SidebarEntry* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6186 "Tree.c"
+#line 6195 "Tree.c"
 	}
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6198 "Tree.c"
+#line 6207 "Tree.c"
 	}
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp4_;
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6206 "Tree.c"
+#line 6215 "Tree.c"
 }
 
 
@@ -6215,57 +6224,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp2_ = NULL;
 	GtkTreePath* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1002 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_get_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), &_tmp0_, &_tmp1_);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_column = _tmp2_;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6239 "Tree.c"
+#line 6248 "Tree.c"
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewColumn* _tmp6_ = NULL;
 		GtkCellRendererText* _tmp7_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = cursor_column;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = self->priv->text_renderer;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (cursor_path);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6259 "Tree.c"
+#line 6268 "Tree.c"
 	}
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6269 "Tree.c"
+#line 6278 "Tree.c"
 }
 
 
@@ -6278,45 +6287,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6302 "Tree.c"
+#line 6311 "Tree.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6320 "Tree.c"
+#line 6329 "Tree.c"
 }
 
 
@@ -6327,55 +6336,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	SidebarInternalDragSourceEntry* _tmp6_ = NULL;
 	SidebarInternalDragSourceEntry* _tmp16_ = NULL;
 	GtkSelectionData* _tmp17_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	drag_source = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->internal_drag_source_entry;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6343 "Tree.c"
+#line 6352 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_ = NULL;
 		SidebarSelectableEntry* _tmp2_ = NULL;
 		SidebarSelectableEntry* _tmp3_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp1_) : NULL);
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp2_;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = selectable;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6358 "Tree.c"
+#line 6367 "Tree.c"
 			SidebarEntry* _tmp4_ = NULL;
 			SidebarInternalDragSourceEntry* _tmp5_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp4_) : NULL);
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6369 "Tree.c"
+#line 6378 "Tree.c"
 		}
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6373 "Tree.c"
+#line 6382 "Tree.c"
 	}
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6379 "Tree.c"
+#line 6388 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		GtkTreePath* _tmp8_ = NULL;
@@ -6387,81 +6396,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		SidebarEntry* _tmp13_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp14_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp15_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selected_path = _tmp7_;
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = selected_path;
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6405 "Tree.c"
+#line 6414 "Tree.c"
 		}
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_);
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp10_;
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == NULL) {
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6425 "Tree.c"
+#line 6434 "Tree.c"
 		}
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->entry;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp13_) : NULL);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (drag_source);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		drag_source = _tmp14_;
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = drag_source;
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_ == NULL) {
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6449 "Tree.c"
+#line 6458 "Tree.c"
 		}
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6455 "Tree.c"
+#line 6464 "Tree.c"
 	}
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = selection_data;
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6465 "Tree.c"
+#line 6474 "Tree.c"
 }
 
 
@@ -6494,87 +6503,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	GdkDragContext* _tmp57_ = NULL;
 	gboolean _tmp58_ = FALSE;
 	guint _tmp59_ = 0U;
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = x;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = y;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp2_;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp3_;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6518 "Tree.c"
+#line 6527 "Tree.c"
 		GdkDragContext* _tmp5_ = NULL;
 		GtkWidget* _tmp6_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6527 "Tree.c"
+#line 6536 "Tree.c"
 			SidebarTreeExternalDropHandler _tmp7_ = NULL;
 			void* _tmp7__target = NULL;
 			GdkDragContext* _tmp8_ = NULL;
 			GtkSelectionData* _tmp9_ = NULL;
 			guint _tmp10_ = 0U;
 			guint _tmp11_ = 0U;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7__target = self->priv->drop_handler_target;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = context;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = selection_data;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = info;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = time;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6548 "Tree.c"
+#line 6557 "Tree.c"
 		} else {
 			GdkDragContext* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6558 "Tree.c"
+#line 6567 "Tree.c"
 		}
-#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6564 "Tree.c"
+#line 6573 "Tree.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp15_;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6578 "Tree.c"
+#line 6587 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
 		SidebarTreeEntryWrapper* _tmp19_ = NULL;
 		SidebarTreeExternalDropHandler _tmp22_ = NULL;
@@ -6583,128 +6592,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GtkSelectionData* _tmp24_ = NULL;
 		guint _tmp25_ = 0U;
 		guint _tmp26_ = 0U;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6591 "Tree.c"
+#line 6600 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6600 "Tree.c"
+#line 6609 "Tree.c"
 		} else {
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6604 "Tree.c"
+#line 6613 "Tree.c"
 		}
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22__target = self->priv->drop_handler_target;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = context;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = selection_data;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = info;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = time;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6626 "Tree.c"
+#line 6635 "Tree.c"
 	}
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6632 "Tree.c"
+#line 6641 "Tree.c"
 		GdkDragContext* _tmp28_ = NULL;
 		guint _tmp29_ = 0U;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp29_ = time;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6647 "Tree.c"
+#line 6656 "Tree.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = _tmp30_->entry;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp31_) : NULL);
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	targetable = _tmp32_;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = targetable;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6661 "Tree.c"
+#line 6670 "Tree.c"
 		GdkDragContext* _tmp34_ = NULL;
 		guint _tmp35_ = 0U;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = time;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6678 "Tree.c"
+#line 6687 "Tree.c"
 	}
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = selection_data;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = gdk_atom_name (_tmp37_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = _tmp38_;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp39_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6696 "Tree.c"
+#line 6705 "Tree.c"
 		SidebarInternalDropTargetEntry* _tmp41_ = NULL;
 		GtkSelectionData* _tmp42_ = NULL;
 		gboolean _tmp43_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = selection_data;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6708 "Tree.c"
+#line 6717 "Tree.c"
 	} else {
 		GeeList* media = NULL;
 		GtkSelectionData* _tmp44_ = NULL;
@@ -6714,75 +6723,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GeeList* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 		GeeList* _tmp50_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp46_ = selection_data;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		media = _tmp48_;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = media;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6734 "Tree.c"
+#line 6743 "Tree.c"
 			GeeList* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
 			gint _tmp53_ = 0;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp53_ = _tmp52_;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6746 "Tree.c"
+#line 6755 "Tree.c"
 		} else {
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6750 "Tree.c"
+#line 6759 "Tree.c"
 		}
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6754 "Tree.c"
+#line 6763 "Tree.c"
 			SidebarInternalDropTargetEntry* _tmp54_ = NULL;
 			GeeList* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = media;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6766 "Tree.c"
+#line 6775 "Tree.c"
 		}
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6770 "Tree.c"
+#line 6779 "Tree.c"
 	}
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = success;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = time;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6786 "Tree.c"
+#line 6795 "Tree.c"
 }
 
 
@@ -6807,90 +6816,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	GdkDragContext* _tmp16_ = NULL;
 	GdkDragAction _tmp17_ = 0;
 	guint _tmp18_ = 0U;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = context;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = x;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = y;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = time;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = x;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = y;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp6_;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp7_;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	has_dest = _tmp8_;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = has_dest;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp10_) {
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6845 "Tree.c"
+#line 6854 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp11_ = 0;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6852 "Tree.c"
+#line 6861 "Tree.c"
 	}
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6856 "Tree.c"
+#line 6865 "Tree.c"
 		GtkTreePath* _tmp12_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 6862 "Tree.c"
+#line 6871 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp13_ = 0;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6869 "Tree.c"
+#line 6878 "Tree.c"
 			GtkTreePath* _tmp14_ = NULL;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
-#line 6875 "Tree.c"
+#line 6884 "Tree.c"
 		}
 	}
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = time;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6894 "Tree.c"
+#line 6903 "Tree.c"
 }
 
 
@@ -6910,91 +6919,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	SidebarEntry* _tmp9_ = NULL;
 	GtkTreeSelection* _tmp10_ = NULL;
 	GtkTreePath* _tmp11_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ > 0) {
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6926 "Tree.c"
+#line 6935 "Tree.c"
 	}
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp2_;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6944 "Tree.c"
+#line 6953 "Tree.c"
 	}
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp5_) : NULL);
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp6_;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = renameable;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ == NULL) {
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6966 "Tree.c"
+#line 6975 "Tree.c"
 	}
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_->entry;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6982 "Tree.c"
+#line 6991 "Tree.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = path;
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6998 "Tree.c"
+#line 7007 "Tree.c"
 }
 
 
@@ -7010,121 +7019,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	SidebarDestroyableEntry* _tmp5_ = NULL;
 	SidebarDestroyableEntry* _tmp6_ = NULL;
 	SidebarDestroyableEntry* _tmp7_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7034 "Tree.c"
+#line 7043 "Tree.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp4_) : NULL);
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	destroyable = _tmp5_;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = destroyable;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (destroyable);
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7056 "Tree.c"
+#line 7065 "Tree.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_destroyable_entry_destroy_source (_tmp7_);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (destroyable);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7070 "Tree.c"
+#line 7079 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7077 "Tree.c"
+#line 7086 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event);
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7086 "Tree.c"
+#line 7095 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
 	GtkCellEditable* _tmp0_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_EDITABLE (editable));
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = editable;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7102 "Tree.c"
+#line 7111 "Tree.c"
 		GtkCellEditable* _tmp1_ = NULL;
 		GtkEntry* _tmp2_ = NULL;
 		GtkEntry* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->text_entry = _tmp2_;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->text_entry;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0);
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->text_entry;
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->text_entry;
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7128 "Tree.c"
+#line 7137 "Tree.c"
 	}
 }
 
@@ -7135,25 +7144,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	guint _tmp2_ = 0U;
 	GtkEntry* _tmp3_ = NULL;
 	guint _tmp4_ = 0U;
-#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 7157 "Tree.c"
+#line 7166 "Tree.c"
 }
 
 
@@ -7169,110 +7178,110 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	guint _tmp14_ = 0U;
 	GtkEntry* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_current_path (self);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp2_);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7195 "Tree.c"
+#line 7204 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarRenameableEntry* _tmp8_ = NULL;
 		SidebarRenameableEntry* _tmp9_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp7_) : NULL);
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		renameable = _tmp8_;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = renameable;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7213 "Tree.c"
+#line 7222 "Tree.c"
 			SidebarRenameableEntry* _tmp10_ = NULL;
 			GtkEntry* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = self->priv->text_entry;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7225 "Tree.c"
+#line 7234 "Tree.c"
 		}
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7229 "Tree.c"
+#line 7238 "Tree.c"
 	}
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
-#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
-#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.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) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7245 "Tree.c"
+#line 7254 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7259 "Tree.c"
+#line 7268 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_;
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 7276 "Tree.c"
+#line 7285 "Tree.c"
 }
 
 
@@ -7285,37 +7294,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	LibraryWindow* _tmp4_ = NULL;
 	Tag* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = new_root_tag_command_new ();
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	creation_command = _tmp0_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = app_window_get_command_manager ();
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_command_manager_unref0 (_tmp2_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = library_window_get_app ();
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7319 "Tree.c"
+#line 7328 "Tree.c"
 }
 
 
@@ -7334,19 +7343,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7338 "Tree.c"
+#line 7347 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7344 "Tree.c"
+#line 7353 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 7350 "Tree.c"
+#line 7359 "Tree.c"
 }
 
 
@@ -7365,19 +7374,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7369 "Tree.c"
+#line 7378 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7375 "Tree.c"
+#line 7384 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7381 "Tree.c"
+#line 7390 "Tree.c"
 }
 
 
@@ -7416,14 +7425,14 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje
 	self->row = _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7420 "Tree.c"
+#line 7429 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path);
-#line 7427 "Tree.c"
+#line 7436 "Tree.c"
 }
 
 
@@ -7441,7 +7450,7 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper
 	result = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7445 "Tree.c"
+#line 7454 "Tree.c"
 }
 
 
@@ -7481,7 +7490,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
 	*result = iter;
 #line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return;
-#line 7485 "Tree.c"
+#line 7494 "Tree.c"
 }
 
 
@@ -7490,7 +7499,7 @@ static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass
 	sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize;
-#line 7494 "Tree.c"
+#line 7503 "Tree.c"
 }
 
 
@@ -7508,7 +7517,7 @@ static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->row);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj);
-#line 7512 "Tree.c"
+#line 7521 "Tree.c"
 }
 
 
@@ -7550,14 +7559,14 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object
 	self->root_position = _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7554 "Tree.c"
+#line 7563 "Tree.c"
 }
 
 
 static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position);
-#line 7561 "Tree.c"
+#line 7570 "Tree.c"
 }
 
 
@@ -7566,7 +7575,7 @@ static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass *
 	sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize;
-#line 7570 "Tree.c"
+#line 7579 "Tree.c"
 }
 
 
@@ -7580,7 +7589,7 @@ static void sidebar_tree_root_wrapper_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj);
-#line 7584 "Tree.c"
+#line 7593 "Tree.c"
 }
 
 
@@ -7631,7 +7640,7 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 	g_signal_new ("page_created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_new ("destroying_page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7635 "Tree.c"
+#line 7644 "Tree.c"
 }
 
 
@@ -7678,7 +7687,7 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 	self->priv->internal_drag_source_entry = NULL;
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->old_path_ref = NULL;
-#line 7682 "Tree.c"
+#line 7691 "Tree.c"
 }
 
 
@@ -7722,7 +7731,7 @@ static void sidebar_tree_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj);
-#line 7726 "Tree.c"
+#line 7735 "Tree.c"
 }
 
 
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index 9c80f00..a3fc8bf 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -197,8 +197,7 @@ public class Sidebar.Tree : Gtk.TreeView {
 
     private void setup_default_context_menu() {
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/sidebar_default_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("sidebar_default_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.default_context_menu = new Gtk.Menu.from_model (model);
             var group = new GLib.SimpleActionGroup ();
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 2ed3ac9..7c51fba 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -728,6 +728,7 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void tags_header_setup_context_menu (TagsHeader* self);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -826,14 +827,14 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed);
-#line 830 "Branch.c"
+#line 831 "Branch.c"
 }
 
 
 static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_altered ((TagsBranch*) self, items);
-#line 837 "Branch.c"
+#line 838 "Branch.c"
 }
 
 
@@ -842,7 +843,7 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe
 	result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 846 "Branch.c"
+#line 847 "Branch.c"
 }
 
 
@@ -883,14 +884,14 @@ TagsBranch* tags_branch_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 887 "Branch.c"
+#line 888 "Branch.c"
 }
 
 
 TagsBranch* tags_branch_new (void) {
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_branch_construct (TAGS_TYPE_BRANCH);
-#line 894 "Branch.c"
+#line 895 "Branch.c"
 }
 
 
@@ -913,7 +914,7 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) {
 	result = (TagsSidebarEntry*) _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 917 "Branch.c"
+#line 918 "Branch.c"
 }
 
 
@@ -925,7 +926,7 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) {
 	result = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 929 "Branch.c"
+#line 930 "Branch.c"
 }
 
 
@@ -955,7 +956,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 959 "Branch.c"
+#line 960 "Branch.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = a;
@@ -981,7 +982,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp9_;
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 985 "Branch.c"
+#line 986 "Branch.c"
 }
 
 
@@ -990,14 +991,14 @@ static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointe
 	result = tag_compare_names ((Tag*) a, (Tag*) b);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 994 "Branch.c"
+#line 995 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1001 "Branch.c"
+#line 1002 "Branch.c"
 }
 
 
@@ -1017,14 +1018,14 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 	_tmp0_ = added_raw;
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp0_ != NULL) {
-#line 1021 "Branch.c"
+#line 1022 "Branch.c"
 		GeeSortedSet* added = NULL;
 		GeeTreeSet* _tmp1_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1028 "Branch.c"
+#line 1029 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp2_ = NULL;
@@ -1037,7 +1038,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1041 "Branch.c"
+#line 1042 "Branch.c"
 				GeeIterator* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 				DataObject* object = NULL;
@@ -1056,7 +1057,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp5_) {
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1060 "Branch.c"
+#line 1061 "Branch.c"
 				}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp6_ = _object_it;
@@ -1080,11 +1081,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1084 "Branch.c"
+#line 1085 "Branch.c"
 			}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1088 "Branch.c"
+#line 1089 "Branch.c"
 		}
 		{
 			GeeIterator* _tag_it = NULL;
@@ -1098,7 +1099,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_tag_it = _tmp13_;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1102 "Branch.c"
+#line 1103 "Branch.c"
 				GeeIterator* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
 				Tag* tag = NULL;
@@ -1126,7 +1127,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp15_) {
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1130 "Branch.c"
+#line 1131 "Branch.c"
 				}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp16_ = _tag_it;
@@ -1142,7 +1143,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				parent_tag = _tmp19_;
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				while (TRUE) {
-#line 1146 "Branch.c"
+#line 1147 "Branch.c"
 					Tag* _tmp20_ = NULL;
 					GeeHashMap* _tmp21_ = NULL;
 					Tag* _tmp22_ = NULL;
@@ -1155,7 +1156,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					if (!(_tmp20_ != NULL)) {
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						break;
-#line 1159 "Branch.c"
+#line 1160 "Branch.c"
 					}
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp21_ = self->priv->entry_map;
@@ -1165,7 +1166,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					if (!_tmp23_) {
-#line 1169 "Branch.c"
+#line 1170 "Branch.c"
 						TagsSidebarEntry* parent_entry = NULL;
 						Tag* _tmp24_ = NULL;
 						TagsSidebarEntry* _tmp25_ = NULL;
@@ -1188,7 +1189,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 						gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						_g_object_unref0 (parent_entry);
-#line 1192 "Branch.c"
+#line 1193 "Branch.c"
 					}
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp29_ = parent_tag;
@@ -1198,7 +1199,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_g_object_unref0 (parent_tag);
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					parent_tag = _tmp30_;
-#line 1202 "Branch.c"
+#line 1203 "Branch.c"
 				}
 #line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp31_ = tag;
@@ -1226,7 +1227,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_tmp38_ = parent_tag;
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (_tmp38_ != NULL) {
-#line 1230 "Branch.c"
+#line 1231 "Branch.c"
 					TagsSidebarEntry* parent_entry = NULL;
 					GeeHashMap* _tmp39_ = NULL;
 					Tag* _tmp40_ = NULL;
@@ -1249,7 +1250,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (parent_entry);
-#line 1253 "Branch.c"
+#line 1254 "Branch.c"
 				} else {
 					SidebarEntry* _tmp44_ = NULL;
 					SidebarEntry* _tmp45_ = NULL;
@@ -1264,7 +1265,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_tmp45_);
-#line 1268 "Branch.c"
+#line 1269 "Branch.c"
 				}
 #line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp47_ = tag;
@@ -1280,21 +1281,21 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (parent_tag);
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (tag);
-#line 1284 "Branch.c"
+#line 1285 "Branch.c"
 			}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_tag_it);
-#line 1288 "Branch.c"
+#line 1289 "Branch.c"
 		}
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (added);
-#line 1292 "Branch.c"
+#line 1293 "Branch.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp49_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp49_ != NULL) {
-#line 1298 "Branch.c"
+#line 1299 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp50_ = NULL;
@@ -1307,7 +1308,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp51_;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1311 "Branch.c"
+#line 1312 "Branch.c"
 				GeeIterator* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
 				DataObject* object = NULL;
@@ -1335,7 +1336,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp53_) {
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1339 "Branch.c"
+#line 1340 "Branch.c"
 				}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp54_ = _object_it;
@@ -1383,16 +1384,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1387 "Branch.c"
+#line 1388 "Branch.c"
 			}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1391 "Branch.c"
+#line 1392 "Branch.c"
 		}
 	}
 #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (restore_point);
-#line 1396 "Branch.c"
+#line 1397 "Branch.c"
 }
 
 
@@ -1401,7 +1402,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 	g_return_if_fail (TAGS_IS_BRANCH (self));
 #line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1405 "Branch.c"
+#line 1406 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -1428,7 +1429,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 		_object_it = _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		while (TRUE) {
-#line 1432 "Branch.c"
+#line 1433 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -1465,7 +1466,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			if (!_tmp7_) {
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				break;
-#line 1469 "Branch.c"
+#line 1470 "Branch.c"
 			}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp8_ = _object_it;
@@ -1493,7 +1494,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				continue;
-#line 1497 "Branch.c"
+#line 1498 "Branch.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = object;
@@ -1547,11 +1548,11 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			_g_object_unref0 (tag);
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (object);
-#line 1551 "Branch.c"
+#line 1552 "Branch.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_object_it);
-#line 1555 "Branch.c"
+#line 1556 "Branch.c"
 	}
 }
 
@@ -1563,7 +1564,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize;
-#line 1567 "Branch.c"
+#line 1568 "Branch.c"
 }
 
 
@@ -1575,7 +1576,7 @@ static void tags_branch_instance_init (TagsBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 1579 "Branch.c"
+#line 1580 "Branch.c"
 }
 
 
@@ -1603,7 +1604,7 @@ static void tags_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj);
-#line 1607 "Branch.c"
+#line 1608 "Branch.c"
 }
 
 
@@ -1630,14 +1631,14 @@ TagsHeader* tags_header_construct (GType object_type) {
 	tags_header_setup_context_menu (self);
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 1634 "Branch.c"
+#line 1635 "Branch.c"
 }
 
 
 TagsHeader* tags_header_new (void) {
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_header_construct (TAGS_TYPE_HEADER);
-#line 1641 "Branch.c"
+#line 1642 "Branch.c"
 }
 
 
@@ -1652,85 +1653,93 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1656 "Branch.c"
+#line 1657 "Branch.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_ = NULL;
+		GObject* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GMenuModel* _tmp7_ = NULL;
+		GtkMenu* _tmp8_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/tag_sidebar_context.ui", &_inner_error_);
+		_tmp2_ = resources_get_ui ("tag_sidebar_context.ui");
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp3_ = _tmp2_;
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_free0 (_tmp3_);
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1671 "Branch.c"
-			goto __catch53_g_error;
+#line 1680 "Branch.c"
+			goto __catch54_g_error;
 		}
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp4_ = self->priv->builder;
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		model = _tmp6_;
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp2_ = self->priv->builder;
+		_tmp7_ = model;
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
+		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+		g_object_ref_sink (_tmp8_);
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		model = _tmp4_;
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp5_ = model;
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		g_object_ref_sink (_tmp6_);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		self->priv->context_menu = _tmp6_;
+#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		self->priv->context_menu = _tmp8_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (model);
-#line 1694 "Branch.c"
+#line 1703 "Branch.c"
 	}
-	goto __finally53;
-	__catch53_g_error:
+	goto __finally54;
+	__catch54_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
+		GError* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		Application* _tmp13_ = NULL;
+		Application* _tmp14_ = NULL;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_error_ = _inner_error_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_inner_error_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp7_ = _error_;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp8_ = _tmp7_->message;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp10_ = _tmp9_;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_free0 (_tmp10_);
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp11_ = application_get_instance ();
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp9_ = _error_;
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp10_ = _tmp9_->message;
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = _tmp11_;
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		application_panic (_tmp12_);
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_application_unref0 (_tmp12_);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		app_window_error_message (_tmp12_, NULL);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_free0 (_tmp12_);
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp13_ = application_get_instance ();
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp14_ = _tmp13_;
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		application_panic (_tmp14_);
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_application_unref0 (_tmp14_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1732 "Branch.c"
+#line 1741 "Branch.c"
 	}
-	__finally53:
+	__finally54:
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1739,7 +1748,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 1743 "Branch.c"
+#line 1752 "Branch.c"
 	}
 }
 
@@ -1765,85 +1774,85 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	GeeList* _tmp10_ = NULL;
 	AddTagsCommand* _tmp11_ = NULL;
 	AddTagsCommand* _tmp12_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	dialog = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialog;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = _tmp3_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names_length1 = _tmp2_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_names_size_ = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = names;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5__length1 = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp5_ == NULL) {
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = TRUE;
-#line 1795 "Branch.c"
+#line 1804 "Branch.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = names;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6__length1 = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 1805 "Branch.c"
+#line 1814 "Branch.c"
 	}
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = FALSE;
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1817 "Branch.c"
+#line 1826 "Branch.c"
 	}
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = names;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9__length1 = names_length1;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = media;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp12_);
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1847 "Branch.c"
+#line 1856 "Branch.c"
 }
 
 
@@ -1855,25 +1864,25 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 1877 "Branch.c"
+#line 1886 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -1894,91 +1903,91 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 		Tag* _tmp21_ = NULL;
 		ReparentTagCommand* _tmp22_ = NULL;
 		ReparentTagCommand* _tmp23_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = tag_global;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = old_tag_path;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE);
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)");
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = old_tag_path;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp13_ = _tmp12_;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp15_ = _tmp14_;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp16_ = _tmp15_ < 2;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp13_);
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp16_) {
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 1936 "Branch.c"
+#line 1945 "Branch.c"
 		}
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp17_ = app_window_get_command_manager ();
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp18_ = _tmp17_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp19_ = old_tag_path;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp20_ = tag_for_path (_tmp19_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp21_ = _tmp20_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp22_ = reparent_tag_command_new (_tmp21_, "/");
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp23_ = _tmp22_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp23_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp21_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp18_);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1966 "Branch.c"
+#line 1975 "Branch.c"
 	}
-#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1972 "Branch.c"
+#line 1981 "Branch.c"
 }
 
 
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) {
 	TagsHeader * self;
-#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 1982 "Branch.c"
+#line 1991 "Branch.c"
 }
 
 
@@ -1987,17 +1996,17 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2001 "Branch.c"
+#line 2010 "Branch.c"
 }
 
 
@@ -2008,7 +2017,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsHeaderPrivate));
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_header_finalize;
-#line 2012 "Branch.c"
+#line 2021 "Branch.c"
 }
 
 
@@ -2019,7 +2028,7 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
-#line 2023 "Branch.c"
+#line 2032 "Branch.c"
 }
 
 
@@ -2028,7 +2037,7 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb
 	tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data;
-#line 2032 "Branch.c"
+#line 2041 "Branch.c"
 }
 
 
@@ -2037,7 +2046,7 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf
 	tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
-#line 2041 "Branch.c"
+#line 2050 "Branch.c"
 }
 
 
@@ -2046,7 +2055,7 @@ static void tags_header_instance_init (TagsHeader * self) {
 	self->priv = TAGS_HEADER_GET_PRIVATE (self);
 #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 2050 "Branch.c"
+#line 2059 "Branch.c"
 }
 
 
@@ -2060,7 +2069,7 @@ static void tags_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj);
-#line 2064 "Branch.c"
+#line 2073 "Branch.c"
 }
 
 
@@ -2086,28 +2095,28 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	TagsSidebarEntry * self = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = tag;
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self->priv->tag = _tmp1_;
 #line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+	self->priv->tag = _tmp1_;
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 2104 "Branch.c"
+#line 2113 "Branch.c"
 }
 
 
 TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) {
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag);
-#line 2111 "Branch.c"
+#line 2120 "Branch.c"
 }
 
 
@@ -2123,17 +2132,17 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	Tag* result = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2137 "Branch.c"
+#line 2146 "Branch.c"
 }
 
 
@@ -2142,17 +2151,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	Tag* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2156 "Branch.c"
+#line 2165 "Branch.c"
 }
 
 
@@ -2161,17 +2170,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->single_tag_icon;
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2175 "Branch.c"
+#line 2184 "Branch.c"
 }
 
 
@@ -2180,32 +2189,32 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
 	Page* result = NULL;
 	Tag* _tmp0_ = NULL;
 	TagPage* _tmp1_ = NULL;
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_page_new (_tmp0_);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2196 "Branch.c"
+#line 2205 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 219 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2209 "Branch.c"
+#line 2218 "Branch.c"
 }
 
 
@@ -2218,7 +2227,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2222 "Branch.c"
+#line 2231 "Branch.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -2249,8 +2258,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2253 "Branch.c"
-				goto __catch54_g_regex_error;
+#line 2262 "Branch.c"
+				goto __catch55_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -2258,7 +2267,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2262 "Branch.c"
+#line 2271 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -2274,8 +2283,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2278 "Branch.c"
-				goto __catch54_g_regex_error;
+#line 2287 "Branch.c"
+				goto __catch55_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -2285,7 +2294,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2289 "Branch.c"
+#line 2298 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -2299,10 +2308,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2303 "Branch.c"
+#line 2312 "Branch.c"
 	}
-	goto __finally54;
-	__catch54_g_regex_error:
+	goto __finally55;
+	__catch55_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2313,9 +2322,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2317 "Branch.c"
+#line 2326 "Branch.c"
 	}
-	__finally54:
+	__finally55:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2324,7 +2333,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2328 "Branch.c"
+#line 2337 "Branch.c"
 	}
 }
 
@@ -2349,85 +2358,85 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 	const gchar* _tmp14_ = NULL;
 	RenameTagCommand* _tmp15_ = NULL;
 	RenameTagCommand* _tmp16_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = new_name;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_prep_tag_name (_tmp0_);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp1_;
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = prepped;
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp2_ == NULL) {
-#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2371 "Branch.c"
+#line 2380 "Branch.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = prepped;
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = string_replace (_tmp3_, "/", "");
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = prepped;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = self->priv->tag;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_get_user_visible_name (_tmp6_);
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp8_);
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp9_) {
-#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2399 "Branch.c"
+#line 2408 "Branch.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = prepped;
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (g_strcmp0 (_tmp10_, "") == 0) {
-#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2409 "Branch.c"
+#line 2418 "Branch.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = app_window_get_command_manager ();
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp13_ = self->priv->tag;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp14_ = prepped;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_);
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp16_ = _tmp15_;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp16_);
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 2431 "Branch.c"
+#line 2440 "Branch.c"
 }
 
 
@@ -2435,37 +2444,37 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 	TagsSidebarEntry * self;
 	Tag* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp1_) {
-#line 2447 "Branch.c"
+#line 2456 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		Tag* _tmp4_ = NULL;
 		DeleteTagCommand* _tmp5_ = NULL;
 		DeleteTagCommand* _tmp6_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = self->priv->tag;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 2469 "Branch.c"
+#line 2478 "Branch.c"
 	}
 }
 
@@ -2482,39 +2491,39 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD
 	gint _tmp6_ = 0;
 	TagUntagPhotosCommand* _tmp7_ = NULL;
 	TagUntagPhotosCommand* _tmp8_ = NULL;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = media;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = media;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp8_);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2518 "Branch.c"
+#line 2527 "Branch.c"
 }
 
 
@@ -2526,25 +2535,25 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 2548 "Branch.c"
+#line 2557 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -2573,35 +2582,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		gchar* _tmp49_ = NULL;
 		ReparentTagCommand* _tmp50_ = NULL;
 		ReparentTagCommand* _tmp51_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = old_tag_path;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = self->priv->tag;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_get_path (_tmp9_);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = _tmp10_;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp11_);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp12_) {
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2605 "Branch.c"
+#line 2614 "Branch.c"
 		}
 		{
 			GeeList* _parent_path_list = NULL;
@@ -2615,33 +2624,33 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _parent_path_index = 0;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp13_ = self->priv->tag;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp14_ = tag_get_path (_tmp13_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp15_ = _tmp14_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp17_ = _tmp16_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp15_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_list = _tmp17_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp18_ = _parent_path_list;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp20_ = _tmp19_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_size = _tmp20_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_index = -1;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 2645 "Branch.c"
+#line 2654 "Branch.c"
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
 				gint _tmp23_ = 0;
@@ -2651,177 +2660,177 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 				gpointer _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
 				const gchar* _tmp28_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp21_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_parent_path_index = _tmp21_ + 1;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp22_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp23_ = _parent_path_size;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (!(_tmp22_ < _tmp23_)) {
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 2667 "Branch.c"
+#line 2676 "Branch.c"
 				}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp24_ = _parent_path_list;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp25_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp26_ = gee_list_get (_tmp24_, _tmp25_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				parent_path = (gchar*) _tmp26_;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp27_ = parent_path;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp28_ = old_tag_path;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (g_strcmp0 (_tmp27_, _tmp28_) == 0) {
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					result = TRUE;
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (parent_path);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_parent_path_list);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (old_tag_path);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					return result;
-#line 2693 "Branch.c"
+#line 2702 "Branch.c"
 				}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_free0 (parent_path);
-#line 2697 "Branch.c"
+#line 2706 "Branch.c"
 			}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_parent_path_list);
-#line 2701 "Branch.c"
+#line 2710 "Branch.c"
 		}
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp29_ = tag_global;
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp30_ = old_tag_path;
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)");
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp32_ = old_tag_path;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp33_ = tag_for_path (_tmp32_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag = _tmp33_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp34_ = old_tag;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp35_ = tag_get_hierarchical_parent (_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_parent = _tmp35_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp37_ = old_tag_parent;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp37_ != NULL) {
-#line 2727 "Branch.c"
+#line 2736 "Branch.c"
 			Tag* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
 			gchar* _tmp40_ = NULL;
 			Tag* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			gchar* _tmp43_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp38_ = old_tag_parent;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp39_ = tag_get_path (_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp40_ = _tmp39_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp41_ = self->priv->tag;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp42_ = tag_get_path (_tmp41_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp43_ = _tmp42_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp43_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp40_);
-#line 2752 "Branch.c"
+#line 2761 "Branch.c"
 		} else {
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = FALSE;
-#line 2756 "Branch.c"
+#line 2765 "Branch.c"
 		}
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp36_) {
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag_parent);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2770 "Branch.c"
+#line 2779 "Branch.c"
 		}
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp44_ = app_window_get_command_manager ();
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp45_ = _tmp44_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp46_ = old_tag;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp47_ = self->priv->tag;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp48_ = tag_get_path (_tmp47_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp49_ = _tmp48_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp51_ = _tmp50_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp51_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp49_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp45_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag_parent);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 2806 "Branch.c"
+#line 2815 "Branch.c"
 	}
-#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2812 "Branch.c"
+#line 2821 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2825 "Branch.c"
+#line 2834 "Branch.c"
 }
 
 
@@ -2865,13 +2874,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2869 "Branch.c"
+#line 2878 "Branch.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2875 "Branch.c"
+#line 2884 "Branch.c"
 }
 
 
@@ -2886,123 +2895,123 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS
 	gint _tmp5__length1 = 0;
 	guint8* _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = tag_get_path (_tmp2_);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = _tmp3_;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp4_);
-#line 2914 "Branch.c"
+#line 2923 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = tags_sidebar_entry_real_get_sidebar_name;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = tags_sidebar_entry_real_get_sidebar_icon;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = tags_sidebar_entry_real_create_page;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
-#line 2931 "Branch.c"
+#line 2940 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename;
-#line 2942 "Branch.c"
+#line 2951 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source;
-#line 2951 "Branch.c"
+#line 2960 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 2962 "Branch.c"
+#line 2971 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select;
-#line 2971 "Branch.c"
+#line 2980 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
-#line 2980 "Branch.c"
+#line 2989 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) {
 	gchar* _tmp0_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->single_tag_icon = _tmp0_;
-#line 2992 "Branch.c"
+#line 3001 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_finalize (GObject* obj) {
 	TagsSidebarEntry * self;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (self->priv->single_tag_icon);
-#line 192 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj);
-#line 3006 "Branch.c"
+#line 3015 "Branch.c"
 }
 
 
diff --git a/src/tags/Branch.vala b/src/tags/Branch.vala
index 41c6feb..52dabdb 100644
--- a/src/tags/Branch.vala
+++ b/src/tags/Branch.vala
@@ -135,8 +135,7 @@ public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry,
     private void setup_context_menu() {
         this.builder = new Gtk.Builder ();
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/tag_sidebar_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("tag_sidebar_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.context_menu = new Gtk.Menu.from_model (model);
         } catch (Error error) {
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 0977264..1945def 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1311,7 +1311,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1314 "HierarchicalTagUtilities.c"
-				goto __catch55_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/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);
@@ -1336,7 +1336,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1339 "HierarchicalTagUtilities.c"
-				goto __catch55_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1362,8 +1362,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1364 "HierarchicalTagUtilities.c"
 	}
-	goto __finally55;
-	__catch55_g_regex_error:
+	goto __finally56;
+	__catch56_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1376,7 +1376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1378 "HierarchicalTagUtilities.c"
 	}
-	__finally55:
+	__finally56:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"